You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/12 17:53:40 UTC
svn commit: r1455614 - in /accumulo/branches/1.5: ./ assemble/ core/
examples/ fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/trace/ src/
Author: ecn
Date: Tue Mar 12 16:53:40 2013
New Revision: 1455614
URL: http://svn.apache.org/r1455614
Log:
ACCUMULO-1173 disconnect events do not set a path
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/examples/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
accumulo/branches/1.5/src/ (props changed)
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1455610
Merged /accumulo/branches/1.4:r1455610
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1455610
Merged /accumulo/branches/1.4/assemble:r1455610
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1455610
Merged /accumulo/branches/1.4/src/core:r1455610
Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/examples:r1455610
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455610
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455610
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455610
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455610
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1455610
Merged /accumulo/branches/1.4/src/server:r1455610
Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1455614&r1=1455613&r2=1455614&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java Tue Mar 12 16:53:40 2013
@@ -270,14 +270,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();
}
}
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1455610
Merged /accumulo/branches/1.4/src/src:r1455610