GH-842: Fix NPEs in KafkaListenerAnnotationBPP #864
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes spring-projects#842 **Cherry-pick to 2.1.x, 2.0.x and 1.3.x**
garyrussell
suggested changes
Nov 7, 2018
...main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
Outdated
Show resolved
Hide resolved
garyrussell
reviewed
Nov 7, 2018
| else if (resolved == null) { | ||
| return null; | ||
| } | ||
| else { |
There was a problem hiding this comment.
You misunderstood me; we don't need an extra branch at all...
private Pattern resolvePattern(KafkaListener kafkaListener) {
Pattern pattern = null;
String text = kafkaListener.topicPattern();
if (StringUtils.hasText(text)) {
Object resolved = resolveExpression(text);
if (resolved instanceof Pattern) {
pattern = (Pattern) resolved;
}
else if (resolved instanceof String) {
pattern = Pattern.compile((String) resolved);
}
else if (resolved != null) {
throw new IllegalStateException(
"topicPattern must resolve to a Pattern or String, not " + resolved.getClass());
}
}
return pattern;
}
garyrussell
pushed a commit
that referenced
this pull request
Nov 7, 2018
garyrussell
pushed a commit
that referenced
this pull request
Nov 7, 2018
garyrussell
pushed a commit
that referenced
this pull request
Nov 7, 2018
|
And cherry-picked to all after resolving conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #842
Cherry-pick to 2.1.x, 2.0.x and 1.3.x