From 42898d4a3dbcb859c00a3b2a067fd3ca23dcd3b5 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 24 Jun 2021 16:30:54 +0300
Subject: [PATCH] refactored onAwakeDev

---
 .../lwm2m/server/uplink/DefaultLwM2MUplinkMsgHandler.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2MUplinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2MUplinkMsgHandler.java
index d0f2047f97..e5192501fc 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2MUplinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2MUplinkMsgHandler.java
@@ -407,14 +407,13 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl
         LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint());
 
         if (LwM2MClientState.REGISTERED.equals(lwM2MClient.getState())) {
-            Lwm2mDeviceProfileTransportConfiguration deviceProfile = clientContext.getProfile(lwM2MClient.getProfileId());
-
             PowerMode powerMode = lwM2MClient.getPowerMode();
             if (powerMode == null) {
+                Lwm2mDeviceProfileTransportConfiguration deviceProfile = clientContext.getProfile(lwM2MClient.getProfileId());
                 powerMode = deviceProfile.getClientLwM2mSettings().getPowerMode();
             }
 
-            if (powerMode.equals(PowerMode.PSM) || powerMode.equals(PowerMode.E_DRX)) {
+            if (PowerMode.PSM.equals(powerMode) || PowerMode.E_DRX.equals(powerMode)) {
                 initAttributes(lwM2MClient);
                 TransportProtos.TransportToDeviceActorMsg toDeviceActorMsg = TransportProtos.TransportToDeviceActorMsg
                         .newBuilder()