Commit 6521caf0040d1863b5483f427d6d74dcd9ea211c

Authored by nickAS21
1 parent 7bcc147d

Lwm2m awake only if state - Registration

@@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { @@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
95 if (objectModel != null) 95 if (objectModel != null)
96 return objectModel.resources.get(resourceId); 96 return objectModel.resources.get(resourceId);
97 else 97 else
98 - log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server.", objectId, resourceId); 98 + log.trace("Tenant hasn't such the TbResources: Object model with id [{}/0/{}].", objectId, resourceId);
99 return null; 99 return null;
100 } catch (Exception e) { 100 } catch (Exception e) {
101 log.error("", e); 101 log.error("", e);
@@ -138,7 +138,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { @@ -138,7 +138,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
138 if (objectModel != null) { 138 if (objectModel != null) {
139 models.get(tenantId).put(key, objectModel); 139 models.get(tenantId).put(key, objectModel);
140 } else { 140 } else {
141 - log.error("Object model with id [{}] version [{}] not found on the server.", objectId, version); 141 + log.error("Tenant hasn't such the resource: Object model with id [{}] version [{}].", objectId, version);
142 } 142 }
143 } finally { 143 } finally {
144 modelsLock.unlock(); 144 modelsLock.unlock();
@@ -187,7 +187,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im @@ -187,7 +187,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
187 sendSimpleRequest(client, downlink, request.getTimeout(), callback); 187 sendSimpleRequest(client, downlink, request.getTimeout(), callback);
188 } 188 }
189 else { 189 else {
190 - callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!"); 190 + callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + "!");
191 } 191 }
192 } 192 }
193 193
@@ -248,7 +248,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im @@ -248,7 +248,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
248 callback.onError(toString(request), e); 248 callback.onError(toString(request), e);
249 } 249 }
250 } else { 250 } else {
251 - callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!"); 251 + callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + "!");
252 } 252 }
253 } 253 }
254 254
@@ -281,7 +281,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im @@ -281,7 +281,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
281 sendSimpleRequest(client, downlink, request.getTimeout(), callback); 281 sendSimpleRequest(client, downlink, request.getTimeout(), callback);
282 } 282 }
283 else { 283 else {
284 - callback.onValidationError(toString(request), "Resource " + request.getVersionedId() + " is not configured in the device profile!"); 284 + callback.onValidationError(toString(request), "Tenant hasn't such the TbResources: " + request.getVersionedId() + " !");
285 } 285 }
286 } else if (resultIds.isObjectInstance()) { 286 } else if (resultIds.isObjectInstance()) {
287 /* 287 /*