Browse Source
Merge pull request #5741 from thingsboard/lwm2m_bs_BC68
lwm2m: BootstrapRead_fix_bug
pull/5754/head
Yevhen Bondarenko
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
8 additions and
2 deletions
-
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
|
|
|
@ -84,7 +84,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements BootstrapTaskProvi |
|
|
|
this.initAfterBootstrapDiscover(discoverResponse); |
|
|
|
findSecurityInstanceId(discoverResponse.getObjectLinks()); |
|
|
|
} else { |
|
|
|
log.info( |
|
|
|
log.warn( |
|
|
|
"Bootstrap Discover return error {} : to continue bootstrap session without autoIdForSecurityObject mode. {}", |
|
|
|
discoverResponse, session); |
|
|
|
} |
|
|
|
@ -100,7 +100,13 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements BootstrapTaskProvi |
|
|
|
return tasks; |
|
|
|
} |
|
|
|
BootstrapReadResponse readResponse = (BootstrapReadResponse) previousResponse.get(0); |
|
|
|
findServerInstanceId(readResponse); |
|
|
|
if (readResponse.isSuccess()) { |
|
|
|
findServerInstanceId(readResponse); |
|
|
|
} else { |
|
|
|
log.warn( |
|
|
|
"Bootstrap ReadResponse return error {} : to continue bootstrap session without find Server Instance Id. {}", |
|
|
|
readResponse, session); |
|
|
|
} |
|
|
|
// create requests from config
|
|
|
|
tasks.requestsToSend = this.toRequests(config, |
|
|
|
config.contentFormat != null ? config.contentFormat : session.getContentFormat()); |
|
|
|
|