diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 65f8ef105..ec7c8118b 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -6,7 +6,7 @@
com.aerospike
aerospike-parent
- 9.0.1
+ 9.0.2
aerospike-benchmarks
jar
diff --git a/client/pom.xml b/client/pom.xml
index f96f92c83..f580cb261 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -6,7 +6,7 @@
com.aerospike
aerospike-parent
- 9.0.1
+ 9.0.2
aerospike-client-jdk21
jar
diff --git a/client/src/com/aerospike/client/async/AsyncTxnAddKeys.java b/client/src/com/aerospike/client/async/AsyncTxnAddKeys.java
index 987ab5a97..df745b6e2 100644
--- a/client/src/com/aerospike/client/async/AsyncTxnAddKeys.java
+++ b/client/src/com/aerospike/client/async/AsyncTxnAddKeys.java
@@ -19,6 +19,7 @@
import com.aerospike.client.AerospikeException;
import com.aerospike.client.Key;
import com.aerospike.client.ResultCode;
+import com.aerospike.client.Txn;
import com.aerospike.client.cluster.Cluster;
import com.aerospike.client.command.OperateArgs;
import com.aerospike.client.command.RecordParser;
@@ -27,11 +28,13 @@
public final class AsyncTxnAddKeys extends AsyncWriteBase {
private final RecordListener listener;
private final OperateArgs args;
+ private final Txn txn;
- public AsyncTxnAddKeys(Cluster cluster, RecordListener listener, Key key, OperateArgs args) {
+ public AsyncTxnAddKeys(Cluster cluster, RecordListener listener, Key key, OperateArgs args, Txn txn) {
super(cluster, args.writePolicy, key);
this.listener = listener;
this.args = args;
+ this.txn = txn;
}
@Override
@@ -42,7 +45,7 @@ protected void writeBuffer() {
@Override
protected boolean parseResult() {
RecordParser rp = new RecordParser(dataBuffer, dataOffset, receiveSize);
- rp.parseTranDeadline(policy.txn);
+ rp.parseTranDeadline(txn);
if (rp.resultCode == ResultCode.OK) {
return true;
diff --git a/client/src/com/aerospike/client/async/AsyncTxnMonitor.java b/client/src/com/aerospike/client/async/AsyncTxnMonitor.java
index 332e51b64..c7f82b910 100644
--- a/client/src/com/aerospike/client/async/AsyncTxnMonitor.java
+++ b/client/src/com/aerospike/client/async/AsyncTxnMonitor.java
@@ -149,7 +149,8 @@ private AsyncTxnMonitor(EventLoop eventLoop, Cluster cluster) {
}
void execute(Policy policy, Operation[] ops) {
- Key tranKey = TxnMonitor.getTxnMonitorKey(policy.txn);
+ Txn txn = policy.txn;
+ Key tranKey = TxnMonitor.getTxnMonitorKey(txn);
WritePolicy wp = TxnMonitor.copyTimeoutPolicy(policy);
RecordListener tranListener = new RecordListener() {
@@ -175,7 +176,7 @@ public void onFailure(AerospikeException ae) {
// Add write key(s) to MRT monitor.
OperateArgs args = new OperateArgs(wp, null, null, ops);
- AsyncTxnAddKeys tranCommand = new AsyncTxnAddKeys(cluster, tranListener, tranKey, args);
+ AsyncTxnAddKeys tranCommand = new AsyncTxnAddKeys(cluster, tranListener, tranKey, args, txn);
eventLoop.execute(cluster, tranCommand);
}
diff --git a/client/src/com/aerospike/client/command/TxnAddKeys.java b/client/src/com/aerospike/client/command/TxnAddKeys.java
index dfb103f32..f52732422 100644
--- a/client/src/com/aerospike/client/command/TxnAddKeys.java
+++ b/client/src/com/aerospike/client/command/TxnAddKeys.java
@@ -21,15 +21,18 @@
import com.aerospike.client.AerospikeException;
import com.aerospike.client.Key;
import com.aerospike.client.ResultCode;
+import com.aerospike.client.Txn;
import com.aerospike.client.cluster.Cluster;
import com.aerospike.client.cluster.Connection;
public final class TxnAddKeys extends SyncWriteCommand {
private final OperateArgs args;
+ private final Txn txn;
- public TxnAddKeys(Cluster cluster, Key key, OperateArgs args) {
+ public TxnAddKeys(Cluster cluster, Key key, OperateArgs args, Txn txn) {
super(cluster, args.writePolicy, key);
this.args = args;
+ this.txn = txn;
}
@Override
@@ -40,7 +43,7 @@ protected void writeBuffer() {
@Override
protected void parseResult(Connection conn) throws IOException {
RecordParser rp = new RecordParser(conn, dataBuffer);
- rp.parseTranDeadline(policy.txn);
+ rp.parseTranDeadline(txn);
if (rp.resultCode == ResultCode.OK) {
return;
diff --git a/client/src/com/aerospike/client/command/TxnMonitor.java b/client/src/com/aerospike/client/command/TxnMonitor.java
index c7a94e192..eda67c084 100644
--- a/client/src/com/aerospike/client/command/TxnMonitor.java
+++ b/client/src/com/aerospike/client/command/TxnMonitor.java
@@ -129,10 +129,11 @@ private static Operation[] getTranOps(Txn txn, ArrayList list) {
}
private static void addWriteKeys(Cluster cluster, Policy policy, Operation[] ops) {
- Key txnKey = getTxnMonitorKey(policy.txn);
+ Txn txn = policy.txn;
+ Key txnKey = getTxnMonitorKey(txn);
WritePolicy wp = copyTimeoutPolicy(policy);
OperateArgs args = new OperateArgs(wp, null, null, ops);
- TxnAddKeys cmd = new TxnAddKeys(cluster, txnKey, args);
+ TxnAddKeys cmd = new TxnAddKeys(cluster, txnKey, args, txn);
cmd.execute();
}
@@ -143,7 +144,6 @@ public static Key getTxnMonitorKey(Txn txn) {
public static WritePolicy copyTimeoutPolicy(Policy policy) {
// Inherit some fields from the original command's policy.
WritePolicy wp = new WritePolicy();
- wp.txn = policy.txn;
wp.connectTimeout = policy.connectTimeout;
wp.socketTimeout = policy.socketTimeout;
wp.totalTimeout = policy.totalTimeout;
diff --git a/examples/pom.xml b/examples/pom.xml
index d1552cbda..6cf459f70 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
com.aerospike
aerospike-parent
- 9.0.1
+ 9.0.2
aerospike-examples
jar
diff --git a/pom.xml b/pom.xml
index bad3815d2..f84fdfe0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.aerospike
aerospike-parent
aerospike-parent
- 9.0.1
+ 9.0.2
pom
https://github.com/aerospike/aerospike-client-java
@@ -38,7 +38,7 @@
2.18.1
3.2.0
- 4.1.114.Final
+ 4.1.115.Final
3.0.1
0.4
1.9.0
diff --git a/test/pom.xml b/test/pom.xml
index f78b86691..2b1aee27c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -6,7 +6,7 @@
com.aerospike
aerospike-parent
- 9.0.1
+ 9.0.2
aerospike-client-test
jar