fix test

spring-projects · Dec 12, 2023 · ed34f30 · ed34f30
1 parent 0969e05
commit ed34f30
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaProducerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaProducerFactory.java
@@ -718,7 +718,6 @@ public void destroy() {
 			}
 		});
 		this.cache.clear();
-		this.transactionIdSuffixStrategy.reset();
 		this.threadBoundProducers.values().forEach(prod -> {
 			try {
 				prod.closeDelegate(this.physicalCloseTimeout, this.listeners);
@@ -727,6 +726,7 @@ public void destroy() {
 				LOGGER.error(e, "Exception while closing producer");
 			}
 		});
+		this.transactionIdSuffixStrategy.reset();
 		this.threadBoundProducers.clear();
 		this.epoch.incrementAndGet();
 	}
@@ -901,7 +901,9 @@ private void closeTransactionProducer(CloseSafeProducer<K, V> producer, Duration
 			producer.closeDelegate(timeout, listeners);
 		}
 		finally {
-			this.transactionIdSuffixStrategy.releaseSuffix(producer.txIdPrefix, producer.txIdSuffix);
+			if (producer.epoch == this.epoch.get()) {
+				this.transactionIdSuffixStrategy.releaseSuffix(producer.txIdPrefix, producer.txIdSuffix);
+			}
 		}
 	}