Author: asankha
Date: Fri Jan 4 04:46:41 2008
New Revision: 608820
URL: http://svn.apache.org/viewvc?rev=608820&view=rev
Log:
fix SYNAPSE-221
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSMessageReceiver.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSOutTransportInfo.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java?rev=608820&r1=608819&r2=608820&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractTransportSender.java
Fri Jan 4 04:46:41 2008
@@ -39,7 +39,7 @@
public abstract class AbstractTransportSender extends AbstractHandler
implements TransportSender {
/** the reference to the actual commons logger to be used for log messages
*/
- protected static Log log = null;
+ protected Log log = null;
/** the name of the transport */
protected String transportName = null;
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSMessageReceiver.java?rev=608820&r1=608819&r2=608820&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSMessageReceiver.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSMessageReceiver.java
Fri Jan 4 04:46:41 2008
@@ -132,6 +132,12 @@
MessageContext msgContext = jmsListener.createMessageContext();
+ // set the JMS Message ID as the Message ID of the MessageContext
+ try {
+ msgContext.setMessageID(message.getJMSMessageID());
+ msgContext.setProperty(JMSConstants.JMS_COORELATION_ID,
message.getJMSMessageID());
+ } catch (JMSException ignore) {}
+
try {
Destination dest = message.getJMSDestination();
String destinationName = null;
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSOutTransportInfo.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSOutTransportInfo.java?rev=608820&r1=608819&r2=608820&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSOutTransportInfo.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSOutTransportInfo.java
Fri Jan 4 04:46:41 2008
@@ -147,7 +147,7 @@
return (Destination) context.lookup(destinationName);
} catch (NameNotFoundException e) {
if (log.isDebugEnabled()) {
- log.debug("Cannot locate destination : " + destinationName + "
using " + url, e);
+ log.debug("Cannot locate destination : " + destinationName + "
using " + url);
}
} catch (NamingException e) {
handleException("Cannot locate destination : " + destinationName +
" using " + url, e);
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java?rev=608820&r1=608819&r2=608820&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSSender.java
Fri Jan 4 04:46:41 2008
@@ -53,7 +53,7 @@
/** A Map containing the JMS connection factories managed by this, keyed
by name */
private Map connectionFactories = new HashMap();
- static {
+ public JMSSender() {
log = LogFactory.getLog(JMSSender.class);
}
@@ -224,14 +224,6 @@
if (waitForResponse) {
replyDestination = JMSUtils.setReplyDestination(
replyDestination, session, message);
- // force the use of a JMS correlation ID if synchronous
- try {
- correlationId = message.getJMSCorrelationID();
- if (correlationId == null) {
- correlationId = UUIDGenerator.getUUID();
- message.setJMSCorrelationID(correlationId);
- }
- } catch (JMSException ignore) {}
}
// send the outgoing message over JMS to the destination
selected
@@ -239,6 +231,12 @@
// if we are expecting a synchronous response back for the
message sent out
if (waitForResponse) {
+ try {
+ connection.start();
+ } catch (JMSException ignore) {}
+ try {
+ correlationId = message.getJMSMessageID();
+ } catch(JMSException ignore) {}
waitForResponseAndProcess(session, replyDestination,
msgCtx, correlationId);
}
}
Modified:
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java?rev=608820&r1=608819&r2=608820&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
(original)
+++
webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
Fri Jan 4 04:46:41 2008
@@ -434,6 +434,13 @@
((TopicPublisher) producer).publish(message);
}
+ if (log.isDebugEnabled()) {
+ log.debug("Sent message to destination : " + destination +
+ "\nMessage ID : " + message.getJMSMessageID() +
+ "\nCorrelation ID : " + message.getJMSCorrelationID() +
+ "\nReplyTo ID : " + message.getJMSReplyTo());
+ }
+
} catch (JMSException e) {
handleException("Error creating a producer or sending to : " +
destination, e);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
