You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2016/03/02 20:41:44 UTC
[1/4] curator git commit: [maven-release-plugin] prepare release
apache-curator-3.1.0
Repository: curator
Updated Branches:
refs/heads/CURATOR-305 [created] 8ef32cc27
[maven-release-plugin] prepare release apache-curator-3.1.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5b1a7eaa
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5b1a7eaa
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5b1a7eaa
Branch: refs/heads/CURATOR-305
Commit: 5b1a7eaa72536cc6d489c3f9eab29fa568a86db6
Parents: fc74045
Author: randgalt <ra...@apache.org>
Authored: Wed Feb 10 15:03:35 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Wed Feb 10 15:03:35 2016 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test/pom.xml | 4 ++--
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
curator-x-rpc/pom.xml | 4 ++--
pom.xml | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 91e2b14..1a17717 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 9f27a50..057cf46 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index 32b2cdb..aedc14e 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 995689c..ae72658 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index acff819..25acfc0 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index 3470c1d..a06c715 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index c257ac3..b3cb3e0 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index ac3b847..82f4152 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>curator-x-rpc</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<name>Curator RPC Proxy</name>
<description>A proxy that bridges non-java environments with the Curator framework and recipes</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/5b1a7eaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f946f59..0ced58e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
@@ -95,7 +95,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git
</developerConnection>
- <tag>HEAD</tag>
+ <tag>apache-curator-3.1.0</tag>
</scm>
<issueManagement>
[3/4] curator git commit: Removed firstTime - I have no idea what it
was supposed to do
Posted by ra...@apache.org.
Removed firstTime - I have no idea what it was supposed to do
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/50550eec
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/50550eec
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/50550eec
Branch: refs/heads/CURATOR-305
Commit: 50550eecf0ad6cc677f92abd48f1de5c8875e689
Parents: a5bab5f
Author: randgalt <ra...@apache.org>
Authored: Wed Mar 2 14:35:01 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Wed Mar 2 14:35:01 2016 -0500
----------------------------------------------------------------------
.../curator/framework/imps/CuratorTransactionImpl.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/50550eec/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
index 20ec274..424ecc6 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
@@ -32,8 +32,8 @@ import org.apache.zookeeper.data.Stat;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
+@SuppressWarnings("deprecation")
class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBridge, CuratorTransactionFinal
{
private final CuratorFrameworkImpl client;
@@ -119,7 +119,6 @@ class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBr
Preconditions.checkState(!isCommitted, "transaction already committed");
isCommitted = true;
- final AtomicBoolean firstTime = new AtomicBoolean(true);
List<OpResult> resultList = RetryLoop.callWithRetry
(
client.getZookeeperClient(),
@@ -128,7 +127,7 @@ class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBr
@Override
public List<OpResult> call() throws Exception
{
- return doOperation(firstTime);
+ return doOperation();
}
}
);
@@ -185,14 +184,8 @@ class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBr
return new CuratorTransactionResult(metadata.getType(), metadata.getForPath(), resultPath, resultStat);
}
- private List<OpResult> doOperation(AtomicBoolean firstTime) throws Exception
+ private List<OpResult> doOperation() throws Exception
{
- boolean localFirstTime = firstTime.getAndSet(false);
- if ( !localFirstTime )
- {
- // TODO
- }
-
List<OpResult> opResults = client.getZooKeeper().multi(transaction);
if ( opResults.size() > 0 )
{
[2/4] curator git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ra...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/a5bab5f4
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/a5bab5f4
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/a5bab5f4
Branch: refs/heads/CURATOR-305
Commit: a5bab5f49751a9a2e1096310cd86491e82ad91a9
Parents: 5b1a7ea
Author: randgalt <ra...@apache.org>
Authored: Wed Feb 10 15:03:48 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Wed Feb 10 15:03:48 2016 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 4 ++--
curator-examples/pom.xml | 2 +-
curator-framework/pom.xml | 4 ++--
curator-recipes/pom.xml | 4 ++--
curator-test/pom.xml | 4 ++--
curator-x-discovery-server/pom.xml | 4 ++--
curator-x-discovery/pom.xml | 4 ++--
curator-x-rpc/pom.xml | 4 ++--
pom.xml | 4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 1a17717..91e2b14 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-client</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Client</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-examples/pom.xml
----------------------------------------------------------------------
diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml
index 057cf46..9f27a50 100644
--- a/curator-examples/pom.xml
+++ b/curator-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-framework/pom.xml
----------------------------------------------------------------------
diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml
index aedc14e..32b2cdb 100644
--- a/curator-framework/pom.xml
+++ b/curator-framework/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-framework</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Framework</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index ae72658..995689c 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-recipes</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Recipes</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 25acfc0..acff819 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-test</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<name>Curator Testing</name>
<description>Unit testing utilities.</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-x-discovery-server/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml
index a06c715..3470c1d 100644
--- a/curator-x-discovery-server/pom.xml
+++ b/curator-x-discovery-server/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery-server</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery Server</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index b3cb3e0..c257ac3 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<artifactId>curator-x-discovery</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Curator Service Discovery</name>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/curator-x-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-rpc/pom.xml b/curator-x-rpc/pom.xml
index 82f4152..ac3b847 100644
--- a/curator-x-rpc/pom.xml
+++ b/curator-x-rpc/pom.xml
@@ -22,12 +22,12 @@
<parent>
<artifactId>apache-curator</artifactId>
<groupId>org.apache.curator</groupId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>curator-x-rpc</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<name>Curator RPC Proxy</name>
<description>A proxy that bridges non-java environments with the Curator framework and recipes</description>
http://git-wip-us.apache.org/repos/asf/curator/blob/a5bab5f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ced58e..f946f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.curator</groupId>
<artifactId>apache-curator</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Curator</name>
@@ -95,7 +95,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/curator.git
</developerConnection>
- <tag>apache-curator-3.1.0</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
[4/4] curator git commit: Expand CuratorTransactionResult to hold an
error and include it in background multi calls
Posted by ra...@apache.org.
Expand CuratorTransactionResult to hold an error and include it in background multi calls
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8ef32cc2
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8ef32cc2
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8ef32cc2
Branch: refs/heads/CURATOR-305
Commit: 8ef32cc275f94a10576fc1a963d9f8db50ad382f
Parents: 50550ee
Author: randgalt <ra...@apache.org>
Authored: Wed Mar 2 14:41:31 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Wed Mar 2 14:41:31 2016 -0500
----------------------------------------------------------------------
.../transaction/CuratorTransactionResult.java | 18 +++++++++++
.../framework/imps/CuratorTransactionImpl.java | 10 +++++-
.../framework/imps/TestTransactionsNew.java | 34 ++++++++++++++++++++
3 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/8ef32cc2/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/CuratorTransactionResult.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/CuratorTransactionResult.java b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/CuratorTransactionResult.java
index 8d8dc2d..ba75791 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/CuratorTransactionResult.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/CuratorTransactionResult.java
@@ -20,6 +20,7 @@
package org.apache.curator.framework.api.transaction;
import com.google.common.base.Predicate;
+import org.apache.zookeeper.OpResult;
import org.apache.zookeeper.data.Stat;
/**
@@ -31,6 +32,7 @@ public class CuratorTransactionResult
private final String forPath;
private final String resultPath;
private final Stat resultStat;
+ private final int error;
/**
* Utility that can be passed to Google Guava to find a particular result. E.g.
@@ -56,10 +58,16 @@ public class CuratorTransactionResult
public CuratorTransactionResult(OperationType type, String forPath, String resultPath, Stat resultStat)
{
+ this(type, forPath, resultPath, resultStat, 0);
+ }
+
+ public CuratorTransactionResult(OperationType type, String forPath, String resultPath, Stat resultStat, int error)
+ {
this.forPath = forPath;
this.resultPath = resultPath;
this.resultStat = resultStat;
this.type = type;
+ this.error = error;
}
/**
@@ -103,4 +111,14 @@ public class CuratorTransactionResult
{
return resultStat;
}
+
+ /**
+ * Returns the operation generated error or <code>0</code> i.e. {@link OpResult.ErrorResult#getErr()}
+ *
+ * @return error or 0
+ */
+ public int getError()
+ {
+ return error;
+ }
}
http://git-wip-us.apache.org/repos/asf/curator/blob/8ef32cc2/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
index 424ecc6..34dc6e1 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorTransactionImpl.java
@@ -158,6 +158,7 @@ class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBr
{
String resultPath = null;
Stat resultStat = null;
+ int error = 0;
switch ( opResult.getType() )
{
default:
@@ -179,9 +180,16 @@ class CuratorTransactionImpl implements CuratorTransaction, CuratorTransactionBr
resultStat = setDataResult.getStat();
break;
}
+
+ case ZooDefs.OpCode.error:
+ {
+ OpResult.ErrorResult errorResult = (OpResult.ErrorResult)opResult;
+ error = errorResult.getErr();
+ break;
+ }
}
- return new CuratorTransactionResult(metadata.getType(), metadata.getForPath(), resultPath, resultStat);
+ return new CuratorTransactionResult(metadata.getType(), metadata.getForPath(), resultPath, resultStat, error);
}
private List<OpResult> doOperation() throws Exception
http://git-wip-us.apache.org/repos/asf/curator/blob/8ef32cc2/curator-framework/src/test/java/org/apache/curator/framework/imps/TestTransactionsNew.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestTransactionsNew.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestTransactionsNew.java
index eaf94f8..4974739 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestTransactionsNew.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestTransactionsNew.java
@@ -30,6 +30,7 @@ import org.apache.curator.framework.api.transaction.CuratorTransactionResult;
import org.apache.curator.framework.api.transaction.OperationType;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.BaseClassForTests;
+import org.apache.curator.test.Timing;
import org.apache.curator.utils.CloseableUtils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -39,11 +40,44 @@ import org.testng.annotations.Test;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
public class TestTransactionsNew extends BaseClassForTests
{
@Test
+ public void testErrors() throws Exception
+ {
+ CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1));
+ try
+ {
+ client.start();
+ CuratorOp createOp1 = client.transactionOp().create().forPath("/bar");
+ CuratorOp createOp2 = client.transactionOp().create().forPath("/z/blue");
+ final BlockingQueue<CuratorEvent> callbackQueue = new LinkedBlockingQueue<>();
+ BackgroundCallback callback = new BackgroundCallback()
+ {
+ @Override
+ public void processResult(CuratorFramework client, CuratorEvent event) throws Exception
+ {
+ callbackQueue.add(event);
+ }
+ };
+ client.transaction().inBackground(callback).forOperations(createOp1, createOp2);
+ CuratorEvent event = callbackQueue.poll(new Timing().milliseconds(), TimeUnit.MILLISECONDS);
+ Assert.assertNotNull(event);
+ Assert.assertNotNull(event.getOpResults());
+ Assert.assertEquals(event.getOpResults().size(), 2);
+ Assert.assertEquals(event.getOpResults().get(0).getError(), KeeperException.Code.OK.intValue());
+ Assert.assertEquals(event.getOpResults().get(1).getError(), KeeperException.Code.NONODE.intValue());
+ }
+ finally
+ {
+ CloseableUtils.closeQuietly(client);
+ }
+ }
+
+ @Test
public void testCheckVersion() throws Exception
{
CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1));