Author: veithen
Date: Sat Nov 8 14:54:42 2008
New Revision: 712446
URL: http://svn.apache.org/viewvc?rev=712446&view=rev
Log:
JMS transport: some more duplicate code elimination.
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=712446&r1=712445&r2=712446&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
Sat Nov 8 14:54:42 2008
@@ -32,7 +32,6 @@
import org.apache.commons.logging.LogFactory;
import javax.jms.*;
-import javax.jms.Queue;
import javax.activation.DataHandler;
import javax.naming.Context;
import java.io.IOException;
@@ -266,21 +265,12 @@
String replyDestinationType, MessageContext msgCtx, String
correlationId) throws AxisFault {
try {
- MessageConsumer consumer = null;
- if
(JMSConstants.DESTINATION_TYPE_QUEUE.equals(replyDestinationType)) {
- if (correlationId != null) {
- consumer = ((QueueSession) session).createReceiver((Queue)
replyDestination,
+ MessageConsumer consumer;
+ if (correlationId != null) {
+ consumer = JMSUtils.createConsumer(session, replyDestination,
"JMSCorrelationID = '" + correlationId + "'");
- } else {
- consumer = ((QueueSession) session).createReceiver((Queue)
replyDestination);
- }
} else {
- if (correlationId != null) {
- consumer = ((TopicSession)
session).createSubscriber((Topic) replyDestination,
- "JMSCorrelationID = '" + correlationId + "'", false);
- } else {
- consumer = ((TopicSession)
session).createSubscriber((Topic) replyDestination);
- }
+ consumer = JMSUtils.createConsumer(session, replyDestination);
}
// how long are we willing to wait for the sync response
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=712446&r1=712445&r2=712446&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
Sat Nov 8 14:54:42 2008
@@ -710,6 +710,16 @@
}
}
+ public static MessageConsumer createConsumer(Session session, Destination
dest, String messageSelector)
+ throws JMSException {
+
+ if (dest instanceof Queue) {
+ return ((QueueSession) session).createReceiver((Queue) dest,
messageSelector);
+ } else {
+ return ((TopicSession) session).createSubscriber((Topic) dest,
messageSelector, false);
+ }
+ }
+
public static Destination createTemporaryDestination(Session session)
throws JMSException {
if (session instanceof QueueSession) {
