Browse Source

Merge pull request #10755 from thingsboard/fix_bug_ObjectVer_not_supported_vewLwm2m

fix_bug: if setSupportedClientObjectsis is not supported LwM2m.Version
pull/10787/head
Viacheslav Klimov 2 years ago
committed by GitHub
parent
commit
20783f017f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
  2. 2
      monitoring/src/main/java/org/thingsboard/monitoring/service/transport/TransportHealthChecker.java

2
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java

@ -460,7 +460,7 @@ public class LwM2mClient {
if (lwM2mPath.isObject()) {
LwM2m.Version ver;
if (link.getAttributes().get("ver")!= null) {
ver = (Version) link.getAttributes().get("ver").getValue();
ver = new LwM2m.Version(link.getAttributes().get("ver").getValue().toString());
} else {
ver = getDefaultObjectIDVer();
}

2
monitoring/src/main/java/org/thingsboard/monitoring/service/transport/TransportHealthChecker.java

@ -145,7 +145,7 @@ public abstract class TransportHealthChecker<C extends TransportMonitoringConfig
profileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration());
deviceProfile.setProfileData(profileData);
} else {
tbClient.getResources(new PageLink(1, 0, "lwm2m monitoring")).getData()
tbClient.getResources(new PageLink(1, 0, "LwM2M Monitoring id=3 v1.0")).getData()
.stream().findFirst()
.orElseGet(() -> {
TbResource newResource = ResourceUtils.getResource("lwm2m/resource.json", TbResource.class);

Loading…
Cancel
Save