Commit 4d21c92fb62f7058d6a4a0118af010188ac4ac7c

Authored by Igor Kulikov
2 parents 70fdb906 331c4d7b

Merge branch 'master' of github.com:thingsboard/thingsboard

... ... @@ -33,3 +33,5 @@ pom.xml.versionsBackup
33 33 **/.env
34 34 .instance_id
35 35 rebuild-docker.sh
  36 +.run/**
  37 +.run
\ No newline at end of file
... ...
... ... @@ -508,8 +508,8 @@ public class DefaultTransportService implements TransportService {
508 508 sessions.forEach((uuid, sessionMD) -> {
509 509 long lastActivityTime = sessionMD.getLastActivityTime();
510 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 513 SessionMetaData gwMetaData = sessions.get(new UUID(sessionInfo.getGwSessionIdMSB(), sessionInfo.getGwSessionIdLSB()));
514 514 if (gwMetaData != null) {
515 515 lastActivityTime = Math.max(gwMetaData.getLastActivityTime(), lastActivityTime);
... ...
... ... @@ -732,6 +732,7 @@
732 732 <exclude>src/browserslist</exclude>
733 733 <exclude>**/*.raw</exclude>
734 734 <exclude>**/apache/cassandra/io/**</exclude>
  735 + <exclude>.run/**</exclude>
735 736 </excludes>
736 737 <mapping>
737 738 <proto>JAVADOC_STYLE</proto>
... ...