Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/905b062b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/905b062b Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/905b062b Branch: refs/heads/CURATOR-3.0 Commit: 905b062b370c3cff399f3f726a6d74ab44d7618e Parents: d8798c2 e9bfb43 Author: randgalt <randg...@apache.org> Authored: Wed Nov 9 20:24:11 2016 -0500 Committer: randgalt <randg...@apache.org> Committed: Wed Nov 9 20:24:11 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/curator/ConnectionState.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/905b062b/curator-client/src/main/java/org/apache/curator/ConnectionState.java ---------------------------------------------------------------------- diff --cc curator-client/src/main/java/org/apache/curator/ConnectionState.java index 4191778,7044ddf..b5af9f2 --- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java +++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java @@@ -178,7 -162,8 +178,7 @@@ class ConnectionState implements Watche for ( Watcher parentWatcher : parentWatchers ) { - OperationTrace trace = new OperationTrace("connection-state-parent-process", tracer.get()); - + OperationTrace trace = new OperationTrace("connection-state-parent-process", tracer.get(), getSessionId()); parentWatcher.process(event); trace.commit(); }