Author: mahadev
Date: Tue Feb 23 18:22:34 2010
New Revision: 915466

URL: http://svn.apache.org/viewvc?rev=915466&view=rev
Log:
ZOOKEEPER-669. watchedevent tostring should clearly output the state/type/path 
(phunt via mahadev)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=915466&r1=915465&r2=915466&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Tue Feb 23 18:22:34 2010
@@ -231,6 +231,9 @@
   ZOOKEEPER-569. Failure of elected leader can lead to never-ending leader 
   election (henry via flavio)
 
+  ZOOKEEPER-669. watchedevent tostring should clearly output the
+  state/type/path (phunt via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java?rev=915466&r1=915465&r2=915466&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java 
(original)
+++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java 
Tue Feb 23 18:22:34 2010
@@ -64,10 +64,8 @@
 
     @Override
     public String toString() {
-        if(path == null)  // then is a state change 
-            return "WatchedEvent: Server state change. New state: " + 
keeperState;
-         else  // is a znode change
-            return "WatchedEvent: Znode change. Path: " + path + " Type: " + 
eventType;
+        return "WatchedEvent state:" + keeperState
+            + " type:" + eventType + " path:" + path;
     }
 
     /**


Reply via email to