Commit 4d21c92fb62f7058d6a4a0118af010188ac4ac7c
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
3 changed files
with
5 additions
and
2 deletions
| @@ -508,8 +508,8 @@ public class DefaultTransportService implements TransportService { | @@ -508,8 +508,8 @@ public class DefaultTransportService implements TransportService { | ||
| 508 | sessions.forEach((uuid, sessionMD) -> { | 508 | sessions.forEach((uuid, sessionMD) -> { |
| 509 | long lastActivityTime = sessionMD.getLastActivityTime(); | 509 | long lastActivityTime = sessionMD.getLastActivityTime(); |
| 510 | TransportProtos.SessionInfoProto sessionInfo = sessionMD.getSessionInfo(); | 510 | TransportProtos.SessionInfoProto sessionInfo = sessionMD.getSessionInfo(); |
| 511 | - if (sessionInfo.getGwSessionIdMSB() > 0 && | ||
| 512 | - sessionInfo.getGwSessionIdLSB() > 0) { | 511 | + if (sessionInfo.getGwSessionIdMSB() != 0 && |
| 512 | + sessionInfo.getGwSessionIdLSB() != 0) { | ||
| 513 | SessionMetaData gwMetaData = sessions.get(new UUID(sessionInfo.getGwSessionIdMSB(), sessionInfo.getGwSessionIdLSB())); | 513 | SessionMetaData gwMetaData = sessions.get(new UUID(sessionInfo.getGwSessionIdMSB(), sessionInfo.getGwSessionIdLSB())); |
| 514 | if (gwMetaData != null) { | 514 | if (gwMetaData != null) { |
| 515 | lastActivityTime = Math.max(gwMetaData.getLastActivityTime(), lastActivityTime); | 515 | lastActivityTime = Math.max(gwMetaData.getLastActivityTime(), lastActivityTime); |
| @@ -732,6 +732,7 @@ | @@ -732,6 +732,7 @@ | ||
| 732 | <exclude>src/browserslist</exclude> | 732 | <exclude>src/browserslist</exclude> |
| 733 | <exclude>**/*.raw</exclude> | 733 | <exclude>**/*.raw</exclude> |
| 734 | <exclude>**/apache/cassandra/io/**</exclude> | 734 | <exclude>**/apache/cassandra/io/**</exclude> |
| 735 | + <exclude>.run/**</exclude> | ||
| 735 | </excludes> | 736 | </excludes> |
| 736 | <mapping> | 737 | <mapping> |
| 737 | <proto>JAVADOC_STYLE</proto> | 738 | <proto>JAVADOC_STYLE</proto> |