GH-1672: More Sonar Polishing

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -1825,10 +1825,6 @@ private void invokeRecordListenerInTx(final ConsumerRecords<K, V> records) {
 				}
 				this.logger.trace(() -> "Processing " + ListenerUtils.recordToString(record));
 				try {
-					if (this.producerPerConsumerPartition) {
-						TransactionSupport
-								.setTransactionIdSuffix(zombieFenceTxIdSuffix(record.topic(), record.partition()));
-					}
 					invokeInTransaction(iterator, record);
 				}
 				catch (ProducerFencedException | FencedInstanceIdException e) {
@@ -1856,6 +1852,10 @@ private void invokeRecordListenerInTx(final ConsumerRecords<K, V> records) {
 		}
 
 		private void invokeInTransaction(Iterator<ConsumerRecord<K, V>> iterator, final ConsumerRecord<K, V> record) {
+			if (this.producerPerConsumerPartition) {
+				TransactionSupport
+						.setTransactionIdSuffix(zombieFenceTxIdSuffix(record.topic(), record.partition()));
+			}
 			this.transactionTemplate.execute(new TransactionCallbackWithoutResult() {
 
 				@Override