zookeeper-commits mailing list archives

Author: phunt
Date: Mon Dec 16 06:29:50 2013
New Revision: 1551119

URL: http://svn.apache.org/r1551119
Log:
ZOOKEEPER-1622. session ids will be negative in the year 2022 (Eric Newton via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1551119&r1=1551118&r2=1551119&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Dec 16 06:29:50 2013
@@ -498,6 +498,9 @@ BUGFIXES:
 
   ZOOKEEPER-1839. Deadlock in NettyServerCnxn (Rakesh R via michim)
 
+  ZOOKEEPER-1622. session ids will be negative in the year 2022
+  (Eric Newton via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java?rev=1551119&r1=1551118&r2=1551119&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java Mon
Dec 16 06:29:50 2013
@@ -75,7 +75,7 @@ public class SessionTrackerImpl extends 
      */
     public static long initializeNextSession(long id) {
         long nextSid = 0;
-        nextSid = (System.currentTimeMillis() << 24) >> 8;
+        nextSid = (System.currentTimeMillis() << 24) >>> 8;
         nextSid =  nextSid | (id <<56);
         return nextSid;
     }