camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r653179 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/processor/ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/ components/camel-jms/src/main/java/...
Date Sun, 04 May 2008 04:58:48 GMT
Author: ningjiang
Date: Sat May  3 21:58:47 2008
New Revision: 653179

URL: http://svn.apache.org/viewvc?rev=653179&view=rev
Log:
Fixed the CS errors

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToRequestor.java
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
    activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Sat May  3 21:58:47 2008
@@ -1084,10 +1084,10 @@
     public Type setBody(Expression expression) {
         return process(ProcessorBuilder.setBody(expression));
     }
-   
+
     /**
      * Adds a processor which sets the body on the OUT message
-     * 
+     *
      * @deprecated Please use {@link #transform(Expression)} instead
      */
     public Type setOutBody(Expression expression) {
@@ -1102,7 +1102,7 @@
     public ExpressionClause<ProcessorType<Type>> setOutBody() {
         return transform();
     }
-    
+
     /**
      * Adds a processor which sets the body on the OUT message
      */
@@ -1121,11 +1121,11 @@
         TransformType answer = new TransformType(clause);
         addOutput(answer);
         return clause;
-    }             
-    
+    }
+
     /**
-	 * Adds a processor which sets the body on the FAULT message
-	 */
+     * Adds a processor which sets the body on the FAULT message
+     */
     public Type setFaultBody(Expression expression) {
         return process(ProcessorBuilder.setFaultBody(expression));
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
Sat May  3 21:58:47 2008
@@ -1,5 +1,4 @@
 /**
- *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Sat May  3 21:58:47 2008
@@ -190,7 +190,7 @@
                         if (operationNameSpace == null) {
                             if (endpoint.isWrapped()) {
                                 result = client.invokeWrapped(operationName, parameters.toArray());
-                            }else {
+                            } else {
                                 result = client.invoke(operationName, parameters.toArray());
                             }
                         } else {

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Sat May  3 21:58:47 2008
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.jms;
 
-import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
-
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.ExceptionListener;
@@ -54,12 +52,14 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.Assert;
 
+import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
+
 
 /**
  * @version $Revision$
  */
 public class JmsConfiguration implements Cloneable {
-    
+
     public static final String QUEUE_PREFIX = "queue:";
     public static final String TOPIC_PREFIX = "topic:";
     public static final String TEMP_QUEUE_PREFIX = "temp:queue:";
@@ -72,7 +72,7 @@
     protected static final String REPLYTO_TEMP_DEST_AFFINITY_PER_COMPONENT = "component";
     protected static final String REPLYTO_TEMP_DEST_AFFINITY_PER_ENDPOINT = "endpoint";
     protected static final String REPLYTO_TEMP_DEST_AFFINITY_PER_PRODUCER = "producer";
-    
+
     private static final transient Log LOG = LogFactory.getLog(JmsConfiguration.class);
     private JmsOperations jmsOperations;
     private DestinationResolver destinationResolver;
@@ -870,7 +870,7 @@
         if (endpoint.getSelector() != null && endpoint.getSelector().length() !=
0) {
             container.setMessageSelector(endpoint.getSelector());
         }
-        
+
         if (container instanceof DefaultMessageListenerContainer) {
             // this includes DefaultMessageListenerContainer102
             DefaultMessageListenerContainer listenerContainer = (DefaultMessageListenerContainer)container;
@@ -957,7 +957,7 @@
             template.setDeliveryPersistent(isReplyToDeliveryPersistent());
         }
     }
-    
+
     public AbstractMessageListenerContainer chooseMessageListenerContainerImplementation()
{
         // TODO we could allow a spring container to auto-inject these objects?
         switch (consumerType) {
@@ -1091,7 +1091,7 @@
             throw new IllegalArgumentException("ReplyTo destination value has to be of type
queue; "
                                               + "e.g: \"queue:replyQueue\"");
         }
-        this.replyToDestination = 
+        this.replyToDestination =
             removeStartingCharacters(replyToDestination.substring(QUEUE_PREFIX.length()),
'/');
     }
 
@@ -1102,7 +1102,7 @@
     public void setReplyToDestinationSelectorName(String replyToDestinationSelectorName)
{
         this.replyToDestinationSelectorName = replyToDestinationSelectorName;
         // in case of consumer -> producer and a named replyTo correlation selector
-        // message passthough is impossible as we need to set the value of selector into

+        // message passthough is impossible as we need to set the value of selector into
         // outgoing message, which would be read-only if passthough were to remain enabled
         if (replyToDestinationSelectorName != null) {
             setAlwaysCopyMessage(true);

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Sat May  3 21:58:47 2008
@@ -33,8 +33,8 @@
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.component.jms.JmsConfiguration.CamelJmsTemplate;
 import org.apache.camel.component.jms.requestor.DeferredRequestReplyMap;
-import org.apache.camel.component.jms.requestor.PersistentReplyToRequestor;
 import org.apache.camel.component.jms.requestor.DeferredRequestReplyMap.DeferredMessageSentCallback;
+import org.apache.camel.component.jms.requestor.PersistentReplyToRequestor;
 import org.apache.camel.component.jms.requestor.Requestor;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.Out;
@@ -49,15 +49,16 @@
  */
 public class JmsProducer extends DefaultProducer {
     private static final transient Log LOG = LogFactory.getLog(JmsProducer.class);
+    RequestorAffinity affinity;
     private final JmsEndpoint endpoint;
     private JmsOperations inOnlyTemplate;
     private JmsOperations inOutTemplate;
     private UuidGenerator uuidGenerator;
     private DeferredRequestReplyMap deferredRequestReplyMap;
     private Requestor requestor;
-    RequestorAffinity affinity;
     private AtomicBoolean started = new AtomicBoolean(false);
-    
+
+
     private enum RequestorAffinity {
         PER_COMPONENT(0),
         PER_ENDPOINT(1),
@@ -91,41 +92,40 @@
     }
 
     protected void testAndSetRequestor() throws RuntimeCamelException {
-        if (started.get() == false) {
+        if (!started.get()) {
             synchronized (this) {
-                if (started.get() == true) {
-                    return;
-                }
-                try {
-                    JmsConfiguration c = endpoint.getConfiguration();
-                    if (c.getReplyTo() != null) {
-                        requestor = new PersistentReplyToRequestor(endpoint.getConfiguration(),

-                                                                   endpoint.getExecutorService());
-                        requestor.start();
-                    } else {
-                        if (affinity == RequestorAffinity.PER_PRODUCER) {
-                            requestor = new Requestor(endpoint.getConfiguration(), 
-                                                      endpoint.getExecutorService());
+                if (!started.get()) {
+                    try {
+                        JmsConfiguration c = endpoint.getConfiguration();
+                        if (c.getReplyTo() != null) {
+                            requestor = new PersistentReplyToRequestor(endpoint.getConfiguration(),
+                                                                       endpoint.getExecutorService());
                             requestor.start();
-                        } else if (affinity == RequestorAffinity.PER_ENDPOINT) {
-                            requestor = endpoint.getRequestor();
-                        } else if (affinity == RequestorAffinity.PER_COMPONENT) {
-                            requestor = ((JmsComponent)endpoint.getComponent()).getRequestor();
+                        } else {
+                            if (affinity == RequestorAffinity.PER_PRODUCER) {
+                                requestor = new Requestor(endpoint.getConfiguration(),
+                                                          endpoint.getExecutorService());
+                                requestor.start();
+                            } else if (affinity == RequestorAffinity.PER_ENDPOINT) {
+                                requestor = endpoint.getRequestor();
+                            } else if (affinity == RequestorAffinity.PER_COMPONENT) {
+                                requestor = ((JmsComponent)endpoint.getComponent()).getRequestor();
+                            }
                         }
+                    } catch (Exception e) {
+                        throw new FailedToCreateProducerException(endpoint, e);
                     }
-                } catch (Exception e) {
-                    throw new FailedToCreateProducerException(endpoint, e);
+                    deferredRequestReplyMap = requestor.getDeferredRequestReplyMap(this);
+                    started.set(true);
                 }
-                deferredRequestReplyMap = requestor.getDeferredRequestReplyMap(this);
-                started.set(true);
             }
         }
     }
-    
+
     protected void testAndUnsetRequestor() throws Exception  {
-        if (started.get() == true) {
+        if (started.get()) {
             synchronized (this) {
-                if (started.get() == false) {
+                if (!started.get()) {
                     return;
                 }
                 requestor.removeDeferredRequestReplyMap(this);
@@ -136,7 +136,7 @@
             }
         }
     }
-    
+
     protected void doStop() throws Exception {
         testAndUnsetRequestor();
         super.doStop();
@@ -146,20 +146,20 @@
         final org.apache.camel.Message in = exchange.getIn();
 
         if (exchange.getPattern().isOutCapable()) {
-            
+
             testAndSetRequestor();
-            
+
             // note due to JMS transaction semantics we cannot use a single transaction
             // for sending the request and receiving the response
             final Destination replyTo = requestor.getReplyTo();
-            
+
             if (replyTo == null) {
                 throw new RuntimeExchangeException("Failed to resolve replyTo destination",
exchange);
             }
-            
+
             final boolean msgIdAsCorrId = endpoint.getConfiguration().isUseMessageIDAsCorrelationID();
             String correlationId = in.getHeader("JMSCorrelationID", String.class);
-            
+
             if (correlationId == null && !msgIdAsCorrId) {
                 in.setHeader("JMSCorrelationID", getUuidGenerator().generateId());
             }
@@ -187,7 +187,7 @@
                     return message;
                 }
             }, callback);
-            
+
             setMessageId(exchange);
 
             // lets wait and return the response
@@ -232,8 +232,8 @@
                     return message;
                 }
             });
-            
-            setMessageId(exchange);            
+
+            setMessageId(exchange);
         }
     }
 
@@ -242,17 +242,17 @@
             return;
         }
         try {
-            JmsExchange jmsExchange = JmsExchange.class.cast(exchange); 
+            JmsExchange jmsExchange = JmsExchange.class.cast(exchange);
             JmsMessage out = jmsExchange.getOut(false);
             if (out != null) {
                 out.setMessageId(out.getJmsMessage().getJMSMessageID());
             }
         } catch (JMSException e) {
-            LOG.warn("Unable to retrieve JMSMessageID from outgoing JMS Message and " 
+            LOG.warn("Unable to retrieve JMSMessageID from outgoing JMS Message and "
                      + "set it into Camel's MessageId", e);
         }
     }
-    
+
     /**
      * Preserved for backwards compatibility.
      *

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToRequestor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToRequestor.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToRequestor.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToRequestor.java
Sat May  3 21:58:47 2008
@@ -122,7 +122,7 @@
 
     @Override
     protected FutureHandler createFutureHandler(String correlationID) {
-        boolean dynamicSelector = (getConfiguration().getReplyToDestinationSelectorName()
== null);
+        boolean dynamicSelector = getConfiguration().getReplyToDestinationSelectorName()
== null;
         if (dynamicSelector) {
             return new PersistentReplyToFutureHandler(this, correlationID);
         }
@@ -131,7 +131,7 @@
 
     @Override
     protected FutureHandler createFutureHandler(DeferredMessageSentCallback callback) {
-        boolean dynamicSelector = (getConfiguration().getReplyToDestinationSelectorName()
== null);
+        boolean dynamicSelector = getConfiguration().getReplyToDestinationSelectorName()
== null;
         if (dynamicSelector) {
             return new PersistentReplyToFutureHandler(this, callback);
         }
@@ -144,8 +144,8 @@
         String replyToSelectorName = getConfiguration().getReplyToDestinationSelectorName();
 
         AbstractMessageListenerContainer container =
-            config.isUseVersion102() ?
-                    (replyToSelectorName != null) ? new DefaultMessageListenerContainer102()
+            config.isUseVersion102()
+                    ? (replyToSelectorName != null) ? new DefaultMessageListenerContainer102()
                            : new CamelDefaultMessageListenerContainer102()
                     : (replyToSelectorName != null) ? new DefaultMessageListenerContainer()
                            : new CamelDefaultMessageListenerContainer();

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
Sat May  3 21:58:47 2008
@@ -56,7 +56,7 @@
     private TimeoutMap requestMap;
     private Map<JmsProducer, DeferredRequestReplyMap> producerDeferredRequestReplyMap;
     private TimeoutMap deferredRequestMap;
-    private TimeoutMap deferredReplyMap;    
+    private TimeoutMap deferredReplyMap;
     private Destination replyTo;
     private long maxRequestTimeout = -1;
     private long replyToResolverTimeout = 5000;
@@ -130,7 +130,7 @@
         map.put(callback, future);
         return future;
     }
-    
+
     protected FutureHandler createFutureHandler(String correlationID) {
         return new FutureHandler();
     }
@@ -178,7 +178,7 @@
     }
 
     public Destination getReplyTo() {
-        synchronized(this) {
+        synchronized (this) {
             try {
                 if (replyTo == null) {
                     wait(replyToResolverTimeout);
@@ -214,7 +214,7 @@
     protected Requestor getOutterInstance() {
         return this;
     }
-    
+
     protected AbstractMessageListenerContainer createListenerContainer() {
         SimpleMessageListenerContainer answer = configuration.isUseVersion102()
             ? new SimpleMessageListenerContainer102() : new SimpleMessageListenerContainer();
@@ -229,7 +229,7 @@
                         queue = session.createTemporaryQueue();
                         setReplyTo(queue);
                     } finally {
-                        getOutterInstance().notifyAll();                        
+                        getOutterInstance().notifyAll();
                     }
                 }
                 return queue;
@@ -267,7 +267,7 @@
     protected JmsConfiguration getConfiguration() {
         return configuration;
     }
-    
+
     public void setReplyToSelectorHeader(org.apache.camel.Message in, Message jmsIn) throws
JMSException {
         // complete
     }

Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=653179&r1=653178&r2=653179&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
(original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
Sat May  3 21:58:47 2008
@@ -37,13 +37,13 @@
  * @version $Revision$
  */
 public class JmsRouteRequestReplyTest extends ContextTestSupport {
-    protected static String REPLY_TO_DESTINATION_SELECTOR_NAME = "camelProducer";
+    protected static final String REPLY_TO_DESTINATION_SELECTOR_NAME = "camelProducer";
     protected static String componentName = "amq";
     protected static String componentName1 = "amq1";
     protected static String endpoingUriA = componentName + ":queue:test.a";
     protected static String endpointUriB = componentName + ":queue:test.b";
     protected static String endpointUriB1 = componentName1 + ":queue:test.b";
-    // note that the replyTo both A and B endpoints share the persistent replyTo queue, 
+    // note that the replyTo both A and B endpoints share the persistent replyTo queue,
     // which is one more way to verify that reply listeners of A and B endpoints don't steal
each other messages
     protected static String endpoingtReplyToUriA = componentName + ":queue:test.a?replyTo=queue:test.a.reply";
     protected static String endpoingtReplyToUriB = componentName + ":queue:test.b?replyTo=queue:test.a.reply";
@@ -59,7 +59,7 @@
     private interface ContextBuilder {
         CamelContext buildContext(CamelContext context) throws Exception;
     }
-    
+
     public static class SingleNodeDeadEndRouteBuilder extends RouteBuilder {
         public void configure() throws Exception {
             from(endpoingUriA).process(new Processor() {
@@ -101,7 +101,7 @@
                     Message in = e.getIn();
                     Message out = e.getOut(true);
                     String selectorValue = in.getHeader(REPLY_TO_DESTINATION_SELECTOR_NAME,
String.class);
-                    String request = in.getBody(String.class);                    
+                    String request = in.getBody(String.class);
                     out.setHeader(REPLY_TO_DESTINATION_SELECTOR_NAME, selectorValue);
                     out.setBody(expectedReply + request.substring(request.indexOf('-')));
                 }
@@ -120,7 +120,7 @@
             });
         }
     };
-    
+
     public static class ContextBuilderMessageID implements ContextBuilder {
         public CamelContext buildContext(CamelContext context) throws Exception {
             ConnectionFactory connectionFactory =
@@ -134,9 +134,9 @@
              */
             context.addComponent(componentName, jmsComponent);
             return context;
-        }        
+        }
     };
-    
+
     public static class ContextBuilderMessageIDReplyToTempDestinationAffinity extends ContextBuilderMessageID
{
         private String affinity;
         public ContextBuilderMessageIDReplyToTempDestinationAffinity(String affinity) {
@@ -154,9 +154,9 @@
         if (inited.compareAndSet(false, true)) {
 
             ContextBuilder contextBuilderMessageID = new ContextBuilderMessageID();
-            ContextBuilder contextBuilderMessageIDReplyToTempDestinationPerComponent = 
+            ContextBuilder contextBuilderMessageIDReplyToTempDestinationPerComponent =
                 new ContextBuilderMessageIDReplyToTempDestinationAffinity("component");
-            ContextBuilder contextBuilderMessageIDReplyToTempDestinationPerProducer = 
+            ContextBuilder contextBuilderMessageIDReplyToTempDestinationPerProducer =
                 new ContextBuilderMessageIDReplyToTempDestinationAffinity("producer");
 
             ContextBuilder contextBuilderCorrelationID = new ContextBuilder() {
@@ -187,7 +187,7 @@
                     return context;
                 }
             };
-            
+
             ContextBuilder contextBuilderCorrelationIDNamedReplyToSelector = new ContextBuilder()
{
                 public CamelContext buildContext(CamelContext context) throws Exception {
                     ConnectionFactory connectionFactory =
@@ -201,7 +201,7 @@
                 }
             };
 
-            
+
             ContextBuilder contextBuilderCorrelationIDDiffComp = new ContextBuilder() {
                 public CamelContext buildContext(CamelContext context) throws Exception {
                     ConnectionFactory connectionFactory =
@@ -238,25 +238,25 @@
             contextBuilders.put("testUseMessageIDAsCorrelationID", contextBuilderMessageID);
             contextBuilders.put("testUseMessageIDAsCorrelationIDReplyToTempDestinationPerComponent",
                                  contextBuilderMessageIDReplyToTempDestinationPerComponent);
-            contextBuilders.put("testUseMessageIDAsCorrelationIDReplyToTempDestinationPerProducer",

+            contextBuilders.put("testUseMessageIDAsCorrelationIDReplyToTempDestinationPerProducer",
                                  contextBuilderMessageIDReplyToTempDestinationPerProducer);
-            
+
             contextBuilders.put("testUseCorrelationID", contextBuilderCorrelationID);
             contextBuilders.put("testUseMessageIDAsCorrelationIDMultiNode", contextBuilderMessageID);
             contextBuilders.put("testUseCorrelationIDMultiNode", contextBuilderCorrelationID);
 
             contextBuilders.put("testUseMessageIDAsCorrelationIDPersistReplyToMultiNode",
contextBuilderMessageID);
             contextBuilders.put("testUseCorrelationIDPersistReplyToMultiNode", contextBuilderCorrelationID);
-            
+
             contextBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToMultiNode",
contextBuilderMessageID);
             contextBuilders.put("testUseCorrelationIDPersistMultiReplyToMultiNode", contextBuilderCorrelationID);
-            
-            contextBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",

+
+            contextBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",
                                  contextBuilderMessageIDNamedReplyToSelector);
-            
-            contextBuilders.put("testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",

+
+            contextBuilders.put("testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",
                                  contextBuilderCorrelationIDNamedReplyToSelector);
-            
+
             contextBuilders.put("testUseCorrelationIDMultiNodeDiffComponents", contextBuilderCorrelationIDDiffComp);
             contextBuilders.put("testUseMessageIDAsCorrelationIDMultiNodeDiffComponents",
contextBuilderMessageIDDiffComp);
             contextBuilders.put("testUseMessageIDAsCorrelationIDTimeout", contextBuilderMessageID);
@@ -268,19 +268,19 @@
             routeBuilders.put("testUseCorrelationID", new SingleNodeRouteBuilder());
             routeBuilders.put("testUseMessageIDAsCorrelationIDMultiNode", new MultiNodeRouteBuilder());
             routeBuilders.put("testUseCorrelationIDMultiNode", new MultiNodeRouteBuilder());
-            
+
             routeBuilders.put("testUseMessageIDAsCorrelationIDPersistReplyToMultiNode", new
MultiNodeRouteBuilder());
             routeBuilders.put("testUseCorrelationIDPersistReplyToMultiNode", new MultiNodeRouteBuilder());
-            
+
             routeBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToMultiNode",
new MultiNodeReplyToRouteBuilder());
             routeBuilders.put("testUseCorrelationIDPersistMultiReplyToMultiNode", new MultiNodeReplyToRouteBuilder());
-            
-            routeBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",

+
+            routeBuilders.put("testUseMessageIDAsCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",
                                new MultiNodeReplyToRouteBuilder());
-            
-            routeBuilders.put("testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",

+
+            routeBuilders.put("testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode",
                                new MultiNodeReplyToRouteBuilder());
-            
+
             routeBuilders.put("testUseCorrelationIDMultiNodeDiffComponents", new MultiNodeDiffCompRouteBuilder());
             routeBuilders.put("testUseMessageIDAsCorrelationIDMultiNodeDiffComponents", new
MultiNodeDiffCompRouteBuilder());
             routeBuilders.put("testUseMessageIDAsCorrelationIDTimeout", new SingleNodeDeadEndRouteBuilder());
@@ -328,7 +328,7 @@
     public void testUseMessageIDAsCorrelationIDReplyToTempDestinationPerComponent() throws
Exception {
         runRequestReplyThreaded(endpoingUriA);
     }
-    
+
     public void testUseMessageIDAsCorrelationIDReplyToTempDestinationPerProducer() throws
Exception {
         runRequestReplyThreaded(endpoingUriA);
     }
@@ -365,11 +365,11 @@
         int oldMaxTasks = maxTasks;
         int oldMaxServerTasks = maxServerTasks;
         int oldMaxCalls = maxCalls;
-        
+
         maxTasks = 10;
         maxServerTasks = 1;
         maxCalls = 2;
-        
+
         try {
             runRequestReplyThreaded(endpoingUriA);
         } finally {
@@ -384,7 +384,7 @@
         int oldMaxTasks = maxTasks;
         int oldMaxServerTasks = maxServerTasks;
         int oldMaxCalls = maxCalls;
-        
+
         maxTasks = 10;
         maxServerTasks = 1;
         maxCalls = 2;
@@ -405,7 +405,7 @@
     public void testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode() throws
Exception {
         runRequestReplyThreaded(endpoingUriA);
     }
-    
+
     public void testUseCorrelationIDTimeout() throws Exception {
         JmsComponent c = (JmsComponent)context.getComponent(componentName);
         c.getConfiguration().setRequestTimeout(1000);
@@ -413,7 +413,7 @@
 
         Object reply = template.requestBody(endpoingUriA, request);
         assertEquals(reply, request);
-        
+
         JmsEndpoint endpoint = template.getResolvedEndpoint(endpoingUriA, JmsEndpoint.class);
         // Wait 1 extra purge cycle to make sure that TimeoutMap had a chance to cleanup
         Thread.sleep(endpoint.getConfiguration().getRequestMapPurgePollTimeMillis());
@@ -424,10 +424,10 @@
         JmsComponent c = (JmsComponent)context.getComponent(componentName);
         c.getConfiguration().setRequestTimeout(1000);
         c.getConfiguration().setRequestMapPurgePollTimeMillis(1000);
-        
+
         Object reply = template.requestBody(endpoingUriA, request);
         assertEquals(reply, request);
-        
+
         JmsEndpoint endpoint = template.getResolvedEndpoint(endpoingUriA, JmsEndpoint.class);
         // Wait 1 extra purge cycle to make sure that TimeoutMap had a chance to cleanup
         Thread.sleep(endpoint.getConfiguration().getRequestMapPurgePollTimeMillis());
@@ -441,7 +441,7 @@
     public void testUseMessageIDAsCorrelationIDMultiNodeDiffComponents() throws Exception
{
         runRequestReplyThreaded(endpoingUriA);
     }
-    
+
     protected void runRequestReplyThreaded(String fromUri) throws Exception {
         final AtomicInteger counter = new AtomicInteger(-1);
         Task[] tasks = new Task[maxTasks];



Mime
View raw message