svn commit: r1424115 - /accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java

[ec...@apache.org]

Author: ecn
Date: Wed Dec 19 21:18:41 2012
New Revision: 1424115

URL: http://svn.apache.org/viewvc?rev=1424115&view=rev
Log:
ACCUMULO-848 tracer has the same issue as the logger (stupid cut-n-paste)

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

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1424115&r1=1424114&r2=1424115&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java Wed Dec 19 21:18:41 2012
@@ -242,12 +242,20 @@ public class TraceServer implements Watc
   public void process(WatchedEvent event) {
     log.debug("event " + event.getPath() + " " + event.getType() + " " + event.getState());
     if (event.getState() == KeeperState.Expired) {
-      log.warn("Logger lost zookeeper registration at " + event.getPath());
+      log.warn("Trace server lost zookeeper registration at " + event.getPath());
       server.stop();
     } else if (event.getType() == EventType.NodeDeleted) {
-      log.warn("Logger zookeeper entry lost " + event.getPath());
+      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);
+    }
+    log.warn("Trace server unable to reset watch on zookeeper registration");
+    server.stop();
   }
   
 }