zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rake...@apache.org
Subject svn commit: r1665316 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java
Date Mon, 09 Mar 2015 18:25:00 GMT
Author: rakeshr
Date: Mon Mar  9 18:24:59 2015
New Revision: 1665316

URL: http://svn.apache.org/r1665316
Log:
ZOOKEEPER-2134 AsyncHammerTest.testHammer fails intermittently(Michi Mutsuzaki via rakeshr)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1665316&r1=1665315&r2=1665316&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Mon Mar  9 18:24:59 2015
@@ -43,6 +43,9 @@ BUGFIXES:
   ZOOKEEPER-1952 Default log directory and file name can be changed 
   (nijel, Hari Krishna Dara via rakeshr)
 
+  ZOOKEEPER-2134 AsyncHammerTest.testHammer fails intermittently
+  (Michi Mutsuzaki via rakeshr)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
 

Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java?rev=1665316&r1=1665315&r2=1665316&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxnSocketNetty.java
Mon Mar  9 18:24:59 2015
@@ -317,16 +317,13 @@ public class ClientCnxnSocketNetty exten
 
     // *************** <END> CientCnxnSocketNetty </END> ******************
     private static class WakeupPacket {
-        private static Packet instance = null;
+        private static final Packet instance = new Packet(null, null, null, null, null);
 
         protected WakeupPacket() {
             // Exists only to defeat instantiation.
         }
 
         public static Packet getInstance() {
-            if (instance == null) {
-                instance = new Packet(null, null, null, null, null);
-            }
             return instance;
         }
     }



Mime
View raw message