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

INT-3908: Fix NPE in the AbstractAggrMGProcessor

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3908

**Cherry-pick to ALL**
This commit is contained in:
Artem Bilan
2015-12-11 17:48:52 -05:00
committed by Gary Russell
parent 4606954cd2
commit 88eb7894de
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java
View File

@@ -74,11 +74,14 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag
if (!aggregatedHeaders.containsKey(key)) {
aggregatedHeaders.put(key, value);
}
else if (!value.equals(aggregatedHeaders.get(key))) {
else {
Object existingValue = aggregatedHeaders.get(key);
if (value != existingValue && (value == null || !value.equals(existingValue))) {
conflictKeys.add(key);
}
}
}
}
for (String keyToRemove : conflictKeys) {
if (logger.isDebugEnabled()) {
logger.debug("Excluding header '" + keyToRemove + "' upon aggregation due to conflict(s) "