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

Protect JmsOutboundGateway against NPE

Browse Source 
https://build.spring.io/browse/INT-MJATS41-532
This commit is contained in:
Artem Bilan
2016-02-02 09:30:09 -05:00
parent d91a6fd467
commit 760e030c56
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1038,7 +1038,9 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
}
finally {
JmsUtils.closeMessageProducer(messageProducer);
this.replies.remove(correlationId);
if (correlationId != null) {
this.replies.remove(correlationId);
}
}
}
@@ -1077,7 +1079,9 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
}
finally {
JmsUtils.closeMessageProducer(messageProducer);
this.replies.remove(correlationId);
if (correlationId != null) {
this.replies.remove(correlationId);
}
}
}
@@ -1488,5 +1492,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
public Executor getTaskExecutor() {
return taskExecutor;
}
}
}