[fix][txn] OpRequestSend reuse problem cause tbClient commitTxnOnTopi…

…c timeout unexpectedly (apache#21505) Co-authored-by: fanjianye <[email protected]>
streamnative · Nov 3, 2023 · f3f5fbc · f3f5fbc
1 parent d47637f
commit f3f5fbc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...n/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java b/...n/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java
@@ -137,8 +137,9 @@ public void endTxn(OpRequestSend op) {
                 if (clientCnx.ctx().channel().isActive()) {
                     clientCnx.registerTransactionBufferHandler(TransactionBufferHandlerImpl.this);
                     outstandingRequests.put(op.requestId, op);
+                    final long requestId = op.requestId;
                     timer.newTimeout(timeout -> {
-                        OpRequestSend peek = outstandingRequests.remove(op.requestId);
+                        OpRequestSend peek = outstandingRequests.remove(requestId);
                         if (peek != null && !peek.cb.isDone() && !peek.cb.isCompletedExceptionally()) {
                             peek.cb.completeExceptionally(new TransactionBufferClientException
                                     .RequestTimeoutException());