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

Merge pull request #119 from markfisher/INT-1868

Browse Source 
fallback if proxy does not support Queue* types
This commit is contained in:
Mark Fisher
2011-10-10 16:51:11 -04:00
parent 60e302dd4f 0a7426287f
commit 3e1b0596bb
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,6 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler {
}
}
@SuppressWarnings("unchecked")
@Override
protected Object handleRequestMessage(final Message<?> message) {
if (!this.initialized) {
@@ -581,7 +580,15 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler {
protected Connection createConnection() throws JMSException {
ConnectionFactory cf = this.connectionFactory;
if (!this.requestPubSubDomain && !this.replyPubSubDomain && cf instanceof QueueConnectionFactory) {
return ((QueueConnectionFactory) cf).createQueueConnection();
try {
return ((QueueConnectionFactory) cf).createQueueConnection();
}
catch (Exception e) {
if (logger.isWarnEnabled()) {
logger.warn("An error occurred while trying to use ConnectionFactory as a QueueConnectionFactory " +
" even though the instanceof check passed. Falling back to use it only as a ConnectionFactory.");
}
}
}
return cf.createConnection();
}
@@ -597,7 +604,15 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler {
*/
protected Session createSession(Connection connection) throws JMSException {
if (!this.requestPubSubDomain && !this.replyPubSubDomain && connection instanceof QueueConnection) {
return ((QueueConnection) connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
try {
return ((QueueConnection) connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
}
catch (Exception e) {
if (logger.isWarnEnabled()) {
logger.warn("An error occurred while trying to use Connection as a QueueConnection " +
" even though the instanceof check passed. Falling back to use it only as a Connection.");
}
}
}
return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
}