Fix Sonar issue

garyrussell · garyrussell · commit ed14bcfb7c40 · 2020-05-06T11:19:21.000-04:00
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
@@ -2377,10 +2377,9 @@ public void onPartitionsAssigned(Collection<TopicPartition> partitions) {
 							+ "consumer paused again, so the initial poll() will never return any records");
 				}
 				ListenerConsumer.this.assignedPartitions.addAll(partitions);
-				if (ListenerConsumer.this.commitCurrentOnAssignment) {
-					if (!collectAndCommitIfNecessary(partitions)) {
-						return;
-					}
+				if (ListenerConsumer.this.commitCurrentOnAssignment
+						&& !collectAndCommitIfNecessary(partitions)) {
+					return;
 				}
 				if (ListenerConsumer.this.genericListener instanceof ConsumerSeekAware) {
 					seekPartitions(partitions, false);

Original file line number	Diff line number	Diff line change
`@@ -2377,10 +2377,9 @@ public void onPartitionsAssigned(Collection<TopicPartition> partitions) {`
`2377`	`2377`	`+ "consumer paused again, so the initial poll() will never return any records");`
`2378`	`2378`	`}`
`2379`	`2379`	`ListenerConsumer.this.assignedPartitions.addAll(partitions);`
`2380`		`- if (ListenerConsumer.this.commitCurrentOnAssignment) {`
`2381`		`- if (!collectAndCommitIfNecessary(partitions)) {`
`2382`		`- return;`
`2383`		`- }`
	`2380`	`+ if (ListenerConsumer.this.commitCurrentOnAssignment`
	`2381`	`+ && !collectAndCommitIfNecessary(partitions)) {`
	`2382`	`+ return;`
`2384`	`2383`	`}`
`2385`	`2384`	`if (ListenerConsumer.this.genericListener instanceof ConsumerSeekAware) {`
`2386`	`2385`	`seekPartitions(partitions, false);`