Author: ningjiang
Date: Mon May 30 02:41:00 2011
New Revision: 1128982
URL: http://svn.apache.org/viewvc?rev=1128982&view=rev
Log:
CAMLE-4008 revert the patch and will try to resolve it in later
Removed:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReply3Test.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConstants.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConstants.java?rev=1128982&r1=1128981&r2=1128982&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConstants.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConstants.java
Mon May 30 02:41:00 2011
@@ -25,7 +25,6 @@ public final class JmsConstants {
public static final String JMS_DESTINATION_NAME =
"CamelJmsDestinationName";
public static final String JMS_MESSAGE_TYPE = "CamelJmsMessageType";
public static final String JMS_DELIVERY_MODE = "CamelJmsDeliveryMode";
- public static final String JMS_REPLY_TO_NAME = "CamelJmsReplyToName";
private JmsConstants() {
// utility class
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1128982&r1=1128981&r2=1128982&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Mon May 30 02:41:00 2011
@@ -341,14 +341,12 @@ public class JmsEndpoint extends Default
ReplyManager answer = replyToReplyManager.get(replyTo);
if (answer == null) {
// use a persistent queue
- PersistentQueueReplyManager replyManager = new
PersistentQueueReplyManager();
- replyManager.setEndpoint(this);
- replyManager.setReplyToName(replyTo);
-
replyManager.setScheduledExecutorService(getReplyManagerExecutorService());
- ServiceHelper.startService(replyManager);
+ answer = new PersistentQueueReplyManager();
+ answer.setEndpoint(this);
+
answer.setScheduledExecutorService(getReplyManagerExecutorService());
+ ServiceHelper.startService(answer);
// remember this manager so we can re-use it
- replyToReplyManager.put(replyTo, replyManager);
- answer = replyManager;
+ replyToReplyManager.put(replyTo, answer);
}
return answer;
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1128982&r1=1128981&r2=1128982&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Mon May 30 02:41:00 2011
@@ -60,9 +60,6 @@ public class JmsProducer extends Default
this.endpoint = endpoint;
}
- @Deprecated
- // We need to look the message header to override the ReplyTo option of
the JMS endpoint
- // So please use initReplyManager(org.apache.camel.Message camelMessage)
protected void initReplyManager() {
if (!started.get()) {
synchronized (this) {
@@ -84,32 +81,6 @@ public class JmsProducer extends Default
}
}
}
-
- protected void initReplyManager(org.apache.camel.Message camelMessage) {
- if (!started.get()) {
- synchronized (this) {
- if (started.get()) {
- return;
- }
- try {
- String replyTo =
camelMessage.getHeader(JmsConstants.JMS_REPLY_TO_NAME , String.class);
- if (replyTo == null) {
- replyTo = endpoint.getReplyTo();
- }
- if (replyTo != null) {
- replyManager = endpoint.getReplyManager(replyTo);
- LOG.info("Using JmsReplyManager: " + replyManager + "
to process replies from: " + replyTo);
- } else {
- replyManager = endpoint.getReplyManager();
- LOG.info("Using JmsReplyManager: " + replyManager + "
to process replies from temporary queue");
- }
- } catch (Exception e) {
- throw new FailedToCreateProducerException(endpoint, e);
- }
- started.set(true);
- }
- }
- }
public boolean process(Exchange exchange, AsyncCallback callback) {
// deny processing if we are not started
@@ -152,7 +123,7 @@ public class JmsProducer extends Default
destinationName = null;
}
- initReplyManager(in);
+ initReplyManager();
// when using message id as correlation id, we need at first to use a
provisional correlation id
// which we then update to the real JMSMessageID when the message has
been sent
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1128982&r1=1128981&r2=1128982&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Mon May 30 02:41:00 2011
@@ -36,17 +36,8 @@ import org.springframework.jms.support.d
*/
public class PersistentQueueReplyManager extends ReplyManagerSupport {
- private String replyToName;
private String replyToSelectorValue;
private MessageSelectorCreator dynamicMessageSelector;
-
- public void setReplyToName(String replyToName) {
- this.replyToName = replyToName;
- }
-
- public String getReplyToName() {
- return replyToName;
- }
public String registerReply(ReplyManager replyManager, Exchange exchange,
AsyncCallback callback,
String originalCorrelationId, String
correlationId, long requestTimeout) {
@@ -179,7 +170,7 @@ public class PersistentQueueReplyManager
resolver = answer.getDestinationResolver();
}
answer.setDestinationResolver(new
DestinationResolverDelegate(resolver));
- answer.setDestinationName(getReplyToName());
+ answer.setDestinationName(endpoint.getReplyTo());
answer.setAutoStartup(true);
answer.setMessageListener(this);
