You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2017/09/12 23:49:45 UTC
[2/2] curator git commit: CURATOR-431 - Clean up stat population
CURATOR-431 - Clean up stat population
-Modified the population of the stat object to use DataTree#copyStat()
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c86ca973
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c86ca973
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c86ca973
Branch: refs/heads/master
Commit: c86ca97326bc68e63b6b10c913cd8e73c0d57d7e
Parents: 931f1de
Author: Cam McKenzie <ca...@apache.org>
Authored: Wed Sep 13 09:48:18 2017 +1000
Committer: Cam McKenzie <ca...@apache.org>
Committed: Wed Sep 13 09:48:18 2017 +1000
----------------------------------------------------------------------
.../framework/imps/CreateBuilderImpl.java | 26 +++-----------------
1 file changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/c86ca973/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index f796584..b2a3fbc 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -38,6 +38,8 @@ import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Op;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
+import org.apache.zookeeper.server.DataTree;
+
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
@@ -640,17 +642,7 @@ public class CreateBuilderImpl implements CreateBuilder, CreateBuilder2, Backgro
if ( (stat != null) && (storingStat != null) )
{
- storingStat.setAversion(stat.getAversion());
- storingStat.setCtime(stat.getCtime());
- storingStat.setCversion(stat.getCversion());
- storingStat.setCzxid(stat.getCzxid());
- storingStat.setDataLength(stat.getDataLength());
- storingStat.setEphemeralOwner(stat.getEphemeralOwner());
- storingStat.setMtime(stat.getMtime());
- storingStat.setMzxid(stat.getMzxid());
- storingStat.setNumChildren(stat.getNumChildren());
- storingStat.setPzxid(stat.getPzxid());
- storingStat.setVersion(stat.getVersion());
+ DataTree.copyStat(stat, storingStat);
}
if ( (rc == KeeperException.Code.NONODE.intValue()) && createParentsIfNeeded )
@@ -1215,17 +1207,7 @@ public class CreateBuilderImpl implements CreateBuilder, CreateBuilder2, Backgro
Stat setStat = client.getZooKeeper().setData(path, data, setDataIfExistsVersion);
if(storingStat != null)
{
- storingStat.setAversion(setStat.getAversion());
- storingStat.setCtime(setStat.getCtime());
- storingStat.setCversion(setStat.getCversion());
- storingStat.setCzxid(setStat.getCzxid());
- storingStat.setDataLength(setStat.getDataLength());
- storingStat.setEphemeralOwner(setStat.getEphemeralOwner());
- storingStat.setMtime(setStat.getMtime());
- storingStat.setMzxid(setStat.getMzxid());
- storingStat.setNumChildren(setStat.getNumChildren());
- storingStat.setPzxid(setStat.getPzxid());
- storingStat.setVersion(setStat.getVersion());
+ DataTree.copyStat(setStat, storingStat);
}
createdPath = path;
}