简柏林 / thingskit · Commits

Commit 331c4d7b1382c78b4d0122c496f987ba5b418986

Authored by Andrii Shvaika
2 parents 2b868646 9d359a80

Merge with 2.5.5

Inline Side-by-side
Showing 3 changed files with 5 additions and 2 deletions
@@ -33,3 +33,5 @@ pom.xml.versionsBackup @@ -33,3 +33,5 @@ pom.xml.versionsBackup
33 **/.env 33 **/.env
34 .instance_id 34 .instance_id
35 rebuild-docker.sh 35 rebuild-docker.sh
  36 +.run/**
  37 +.run
@@ -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>