Browse Source

Lwm2m awake only if state - Registration

pull/5397/head
nickAS21 5 years ago
parent
commit
6521caf004
  1. 4
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
  2. 6
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java

4
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java

@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
if (objectModel != null)
return objectModel.resources.get(resourceId);
else
log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server.", objectId, resourceId);
log.trace("Tenant hasn't such the TbResources: Object model with id [{}/0/{}].", objectId, resourceId);
return null;
} catch (Exception e) {
log.error("", e);
@ -138,7 +138,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
if (objectModel != null) {
models.get(tenantId).put(key, objectModel);
} else {
log.error("Object model with id [{}] version [{}] not found on the server.", objectId, version);
log.error("Tenant hasn't such the resource: Object model with id [{}] version [{}].", objectId, version);
}
} finally {
modelsLock.unlock();

6
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java

@ -187,7 +187,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
sendSimpleRequest(client, downlink, request.getTimeout(), callback);
}
else {
callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!");
callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + "!");
}
}
@ -248,7 +248,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
callback.onError(toString(request), e);
}
} else {
callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!");
callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + "!");
}
}
@ -281,7 +281,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
sendSimpleRequest(client, downlink, request.getTimeout(), callback);
}
else {
callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!");
callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + " !");
}
} else if (resultIds.isObjectInstance()) {
/*

Loading…
Cancel
Save