[pulsar-client] Avoid leak on publish failure on batch message (apach…

…e#5442)
yciabaud · Oct 23, 2019 · b466b08 · b466b08
1 parent 6258695
commit b466b08
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -468,10 +468,13 @@ private void doBatchSendAndAdd(MessageImpl<T> msg, SendCallback callback, ByteBu
             log.debug("[{}] [{}] Closing out batch to accommodate large message with size {}", topic, producerName,
                     msg.getDataBuffer().readableBytes());
         }
-        batchMessageAndSend();
-        batchMessageContainer.add(msg, callback);
-        lastSendFuture = callback.getFuture();
-        payload.release();
+        try {
+            batchMessageAndSend();
+            batchMessageContainer.add(msg, callback);
+            lastSendFuture = callback.getFuture();
+        } finally {
+            payload.release();
+        }
     }
 
     private boolean isValidProducerState(SendCallback callback) {