Showing
1 changed file
with
4 additions
and
2 deletions
| @@ -6,6 +6,7 @@ import com.google.common.util.concurrent.ListenableFuture; | @@ -6,6 +6,7 @@ import com.google.common.util.concurrent.ListenableFuture; | ||
| 6 | import com.google.common.util.concurrent.MoreExecutors; | 6 | import com.google.common.util.concurrent.MoreExecutors; |
| 7 | import lombok.Getter; | 7 | import lombok.Getter; |
| 8 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
| 9 | +import org.apache.commons.lang3.StringUtils; | ||
| 9 | import org.jetbrains.annotations.Nullable; | 10 | import org.jetbrains.annotations.Nullable; |
| 10 | import org.thingsboard.common.util.JacksonUtil; | 11 | import org.thingsboard.common.util.JacksonUtil; |
| 11 | import org.thingsboard.server.common.data.DeviceProfile; | 12 | import org.thingsboard.server.common.data.DeviceProfile; |
| @@ -82,8 +83,9 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont | @@ -82,8 +83,9 @@ public abstract class TcpDeviceWareSessionContext extends DeviceAwareSessionCont | ||
| 82 | DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration(); | 83 | DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration(); |
| 83 | 84 | ||
| 84 | TkTcpDeviceProfileTransportConfiguration tcpConfiguration = (TkTcpDeviceProfileTransportConfiguration) transportConfiguration; | 85 | TkTcpDeviceProfileTransportConfiguration tcpConfiguration = (TkTcpDeviceProfileTransportConfiguration) transportConfiguration; |
| 85 | - this.authScriptId = UUID.fromString(tcpConfiguration.getAuthScriptId()); | ||
| 86 | - | 86 | + if(null != tcpConfiguration && StringUtils.isNotEmpty(tcpConfiguration.getAuthScriptId())){ |
| 87 | + this.authScriptId = UUID.fromString(tcpConfiguration.getAuthScriptId()); | ||
| 88 | + } | ||
| 87 | this.telemetryScriptId = UUID.fromString(tcpConfiguration.getUpScriptId()); | 89 | this.telemetryScriptId = UUID.fromString(tcpConfiguration.getUpScriptId()); |
| 88 | TransportProtos.ScriptProto upScript = context.getTransportService().getScripts(TransportProtos.ScriptProto.newBuilder().setScriptIdLSB(telemetryScriptId.getLeastSignificantBits()).setScriptIdMSB(telemetryScriptId.getMostSignificantBits()).build()).get(0); | 90 | TransportProtos.ScriptProto upScript = context.getTransportService().getScripts(TransportProtos.ScriptProto.newBuilder().setScriptIdLSB(telemetryScriptId.getLeastSignificantBits()).setScriptIdMSB(telemetryScriptId.getMostSignificantBits()).build()).get(0); |
| 89 | cacheScript(telemetryScriptId, TkScriptFunctionType.TRANSPORT_TCP_UP, upScript.getConvertJs(), null); | 91 | cacheScript(telemetryScriptId, TkScriptFunctionType.TRANSPORT_TCP_UP, upScript.getConvertJs(), null); |