Spring/spring-kafka
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Missing Re-Interrupts

Browse Source
This commit is contained in:
Gary Russell
2022-11-03 09:43:53 -04:00
parent 6ec1b3bb02
commit 8c2b325600
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java
View File

@@ -201,12 +201,15 @@ public class KafkaAdmin extends KafkaResourceFactory
addOrModifyTopicsIfNeeded(adminClient, newTopics);
return true;
}
catch (Exception e) {
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
catch (Exception ex) {
if (!this.initializingContext || this.fatalIfBrokerNotAvailable) {
throw new IllegalStateException("Could not configure topics", e);
throw new IllegalStateException("Could not configure topics", ex);
}
else {
LOGGER.error(e, "Could not configure topics");
LOGGER.error(ex, "Could not configure topics");
}
}
finally {

6
spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java
View File

@@ -488,7 +488,11 @@ public abstract class AbstractMessageListenerContainer<K, V>
entry.getValue().get(this.topicCheckTimeout, TimeUnit.SECONDS);
return false;
}
catch (@SuppressWarnings("unused") Exception e) {
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
return true;
}
catch (@SuppressWarnings("unused") Exception ex) {
return true;
}
})