Merge pull request #360 from aerospike/stage

 Java Client 9.0.2 for JDK21

benchmarks/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.aerospike</groupId>
     <artifactId>aerospike-parent</artifactId>
-    <version>9.0.1</version>
+    <version>9.0.2</version>
   </parent>
   <artifactId>aerospike-benchmarks</artifactId>
   <packaging>jar</packaging>

client/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.aerospike</groupId>
     <artifactId>aerospike-parent</artifactId>
-    <version>9.0.1</version>
+    <version>9.0.2</version>
   </parent>
   <artifactId>aerospike-client-jdk21</artifactId>
   <packaging>jar</packaging>

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;

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);
 	}
 

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;

client/src/com/aerospike/client/command/TxnMonitor.java

@@ -129,10 +129,11 @@ private static Operation[] getTranOps(Txn txn, ArrayList<Value> 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;

examples/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.aerospike</groupId>
     <artifactId>aerospike-parent</artifactId>
-    <version>9.0.1</version>
+    <version>9.0.2</version>
   </parent>
   <artifactId>aerospike-examples</artifactId>
   <packaging>jar</packaging>

pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.aerospike</groupId>
   <artifactId>aerospike-parent</artifactId>
   <name>aerospike-parent</name>
-  <version>9.0.1</version>
+  <version>9.0.2</version>
   <packaging>pom</packaging>
   <url>https://github.com/aerospike/aerospike-client-java</url>
 
@@ -38,7 +38,7 @@
     <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
     <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
 
-    <netty.version>4.1.114.Final</netty.version>
+    <netty.version>4.1.115.Final</netty.version>
     <luaj-jse.version>3.0.1</luaj-jse.version>
     <jbcrypt.version>0.4</jbcrypt.version>
     <commons-cli.version>1.9.0</commons-cli.version>

test/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.aerospike</groupId>
     <artifactId>aerospike-parent</artifactId>
-    <version>9.0.1</version>
+    <version>9.0.2</version>
   </parent>
   <artifactId>aerospike-client-test</artifactId>
   <packaging>jar</packaging>