Author: ecn
Date: Tue Mar 12 16:55:12 2013
New Revision: 1455616
URL: http://svn.apache.org/r1455616
Log:
ACCUMULO-1173 disconnect events do not set a path
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1455610
Merged /accumulo/branches/1.5:r1455614
Merged /accumulo/branches/1.4:r1455610
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1455610
Merged /accumulo/branches/1.4/assemble:r1455610
Merged /accumulo/branches/1.5/assemble:r1455614
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1455614
Merged /accumulo/branches/1.4/core:r1455610
Merged /accumulo/branches/1.4/src/core:r1455610
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/examples:r1455610
Merged /accumulo/branches/1.5/examples:r1455614
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455614
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/trunk/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.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455614
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455610
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1455610
Merged /accumulo/branches/1.5/server:r1455614
Merged /accumulo/branches/1.4/src/server:r1455610
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=1455616&r1=1455615&r2=1455616&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
Tue Mar 12 16:55:12 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/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1455610
Merged /accumulo/branches/1.4/src/src:r1455610
Merged /accumulo/branches/1.5/src:r1455614
