svn commit: r1455610 - /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java

[ecn]

Author: ecn
Date: Tue Mar 12 16:46:08 2013
New Revision: 1455610

URL: http://svn.apache.org/r1455610
Log:
ACCUMULO-1173 disconnect events do not set a path

Modified:
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1455610&r1=1455609&r2=1455610&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 Tue Mar 12 16:46:08 2013
@@ -236,14 +236,16 @@ public class TraceServer implements Watc
       log.warn("Trace server zookeeper entry lost " + event.getPath());
       server.stop();
     }
-    try {
-    if (ZooReaderWriter.getInstance().exists(event.getPath(), this))
-      return;
-    } catch (Exception ex) {
-      log.error(ex, ex);
+    if (event.getPath() != null) {
+      try {
+        if (ZooReaderWriter.getInstance().exists(event.getPath(), this))
+          return;
+      } catch (Exception ex) {
+        log.error(ex, ex);
+      }
+      log.warn("Trace server unable to reset watch on zookeeper registration");
+      server.stop();
     }
-    log.warn("Trace server unable to reset watch on zookeeper registration");
-    server.stop();
   }
   
 }