Author: asankha
Date: Sun Jan 20 20:50:36 2008
New Revision: 613757
URL: http://svn.apache.org/viewvc?rev=613757&view=rev
Log:
fix broken JMS 1.0.x compatibility
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java?rev=613757&r1=613756&r2=613757&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
Sun Jan 20 20:50:36 2008
@@ -227,7 +227,7 @@
} else if
(JMSConstants.DESTINATION_TYPE_TOPIC.equals(getConnectionFactoryType())) {
tConFac = (TopicConnectionFactory) conFactory;
} else {
- conFac = conFactory;
+ handleException("Unable to determine type of Connection
Factory - i.e. Queue/Topic", null);
}
String user = (String)
jndiProperties.get(Context.SECURITY_PRINCIPAL);
@@ -238,16 +238,12 @@
connection = qConFac.createQueueConnection(user, pass);
} else if (tConFac != null) {
connection = tConFac.createTopicConnection(user, pass);
- } else {
- connection = conFac.createConnection(user, pass);
}
} else {
if (qConFac != null) {
connection = qConFac.createQueueConnection();
} else if (tConFac != null) {
connection = tConFac.createTopicConnection();
- } else {
- connection = conFac.createConnection();
}
}
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java?rev=613757&r1=613756&r2=613757&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
Sun Jan 20 20:50:36 2008
@@ -141,7 +141,8 @@
} else if
(JMSConstants.DESTINATION_TYPE_TOPIC.equals(jmsOut.getDestinationType())) {
tConFac = (TopicConnectionFactory)
jmsOut.getConnectionFactory();
} else {
- conFac = (ConnectionFactory)
jmsOut.getConnectionFactory();
+ handleException("Unable to determine type of JMS "
+
+ "Connection Factory - i.e Queue/Topic");
}
if (user != null && pass != null) {
@@ -149,16 +150,12 @@
connection =
qConFac.createQueueConnection(user, pass);
} else if (tConFac != null) {
connection =
tConFac.createTopicConnection(user, pass);
- } else {
- connection = conFac.createConnection(user,
pass);
}
} else {
if (qConFac != null) {
connection = qConFac.createQueueConnection();
} else if (tConFac != null) {
connection = tConFac.createTopicConnection();
- } else {
- connection = conFac.createConnection();
}
}
@@ -168,8 +165,6 @@
} else if
(JMSConstants.DESTINATION_TYPE_TOPIC.equals(jmsOut.getDestinationType())) {
session = ((TopicConnection)connection).
createTopicSession(false,
Session.AUTO_ACKNOWLEDGE);
- } else {
- session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
}
} catch (JMSException e) {
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java?rev=613757&r1=613756&r2=613757&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
Sun Jan 20 20:50:36 2008
@@ -707,14 +707,10 @@
} else {
return ((TopicConnectionFactory)
conFactory).createTopicConnection();
}
-
} else {
- if (user != null && pass != null) {
- return ((ConnectionFactory) conFactory).createConnection(user,
pass);
- } else {
- return ((ConnectionFactory) conFactory).createConnection();
- }
+ handleException("Unable to determine type of JMS Connection
Factory - i.e Queue/Topic");
}
+ return null;
}
public static Session createSession(Connection con,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
