Author: rgs
Date: Sun Dec 6 19:00:22 2015
New Revision: 1718206
URL: http://svn.apache.org/viewvc?rev=1718206&view=rev
Log:
ZOOKEEPER-2335: Java Compilation Error in ClientCnxn.java
(Arshad Mohammad via rgs)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1718206&r1=1718205&r2=1718206&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun Dec 6 19:00:22 2015
@@ -68,6 +68,9 @@ BUGFIXES:
ZOOKEEPER-2330: ZooKeeper close API does not close Login thread
(Arshad Mohammad via rgs)
+ ZOOKEEPER-2335: Java Compilation Error in ClientCnxn.java
+ (Arshad Mohammad via rgs)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified:
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1718206&r1=1718205&r2=1718206&view=diff
==============================================================================
---
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
(original)
+++
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
Sun Dec 6 19:00:22 2015
@@ -46,7 +46,6 @@ import javax.security.sasl.SaslException
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.MDC;
import org.apache.zookeeper.AsyncCallback.ACLCallback;
import org.apache.zookeeper.AsyncCallback.Children2Callback;
import org.apache.zookeeper.AsyncCallback.ChildrenCallback;
@@ -88,6 +87,7 @@ import org.apache.zookeeper.server.ZooKe
import org.apache.zookeeper.server.ZooTrace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
/**
* This class manages the socket i/o for the client. ClientCnxn maintains a
list
