fixed a merge issue
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/471610c4 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/471610c4 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/471610c4 Branch: refs/heads/CURATOR-3.0 Commit: 471610c46bc123fec9c2d2012d5eab9fc6df9620 Parents: f769717 Author: randgalt <randg...@apache.org> Authored: Tue May 12 10:56:05 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Tue May 12 10:56:05 2015 -0500 ---------------------------------------------------------------------- .../org/apache/curator/framework/imps/GetConfigBuilderImpl.java | 2 +- .../org/apache/curator/framework/imps/ReconfigBuilderImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/471610c4/curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java index c9bbbf6..a837809 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/GetConfigBuilderImpl.java @@ -143,7 +143,7 @@ public class GetConfigBuilderImpl implements GetConfigBuilder, BackgroundOperati public void processResult(int rc, String path, Object ctx, byte[] data, Stat stat) { trace.commit(); - CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.GET_CONFIG, rc, path, null, ctx, stat, data, null, null, null); + CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.GET_CONFIG, rc, path, null, ctx, stat, data, null, null, null, null); client.processBackgroundOperation(operationAndData, event); } }; http://git-wip-us.apache.org/repos/asf/curator/blob/471610c4/curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java index f4dba90..0efa481 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/ReconfigBuilderImpl.java @@ -476,7 +476,7 @@ public class ReconfigBuilderImpl implements { DataTree.copyStat(stat, responseStat); } - CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.RECONFIG, rc, path, null, ctx, stat, bytes, null, null, null); + CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.RECONFIG, rc, path, null, ctx, stat, bytes, null, null, null, null); client.processBackgroundOperation(data, event); } };