Browse Source
Merge pull request #5878 from YevhenBondarenko/fix/improvements
[3.3.3] correct sending lwm2m logs / device update improvements
pull/5910/head
Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
2 additions and
3 deletions
-
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/TbLwM2MReadCallback.java
-
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/TbLwM2MTargetedCallback.java
-
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
|
|
|
@ -35,7 +35,6 @@ public class TbLwM2MReadCallback extends TbLwM2MUplinkTargetedCallback<ReadReque |
|
|
|
@Override |
|
|
|
public void onSuccess(ReadRequest request, ReadResponse response) { |
|
|
|
logForBadResponse(response.getCode().getCode(), responseToString(response), request.getClass().getSimpleName()); |
|
|
|
super.onSuccess(request, response); |
|
|
|
handler.onUpdateValueAfterReadResponse(client.getRegistration(), versionedId, response); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -48,7 +48,7 @@ public abstract class TbLwM2MTargetedCallback<R, T> extends AbstractTbLwM2MReque |
|
|
|
@Override |
|
|
|
public void onSuccess(R request, T response) { |
|
|
|
//TODO convert camelCase to "camel case" using .split("(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])")
|
|
|
|
if (response instanceof LwM2mResponse && !(response instanceof ReadResponse)) { |
|
|
|
if (response instanceof LwM2mResponse) { |
|
|
|
logForBadResponse(((LwM2mResponse) response).getCode().getCode(), response.toString(), request.getClass().getSimpleName()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -957,7 +957,7 @@ public class DefaultTransportService implements TransportService { |
|
|
|
if ((md.getSessionInfo().getDeviceIdMSB() == deviceIdMSB && md.getSessionInfo().getDeviceIdLSB() == deviceIdLSB)) { |
|
|
|
DeviceProfile newDeviceProfile; |
|
|
|
if (md.getSessionInfo().getDeviceProfileIdMSB() != deviceProfileIdMSB |
|
|
|
&& md.getSessionInfo().getDeviceProfileIdLSB() != deviceProfileIdLSB) { |
|
|
|
|| md.getSessionInfo().getDeviceProfileIdLSB() != deviceProfileIdLSB) { |
|
|
|
//TODO: if transport types are different - we should close the session.
|
|
|
|
newDeviceProfile = deviceProfileCache.get(new DeviceProfileId(new UUID(deviceProfileIdMSB, deviceProfileIdLSB))); |
|
|
|
} else { |
|
|
|
|