svn commit: r1200214 - in /camel/trunk/components/camel-jms/src: main/java/org/apache/camel/component/jms/JmsEndpoint.java test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

[davsclaus]

Author: davsclaus
Date: Thu Nov 10 08:38:28 2011
New Revision: 1200214

URL: http://svn.apache.org/viewvc?rev=1200214&view=rev
Log:
CAMEL-4599: Fixed destination name in thread name to not contain parameters

Modified:
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

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=1200214&r1=1200213&r2=1200214&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
 Thu Nov 10 08:38:28 2011
@@ -209,7 +209,7 @@ public class JmsEndpoint extends Default
 
         // include destination name as part of thread and transaction name
         String consumerName = "JmsConsumer[" + 
getEndpointConfiguredDestinationName() + "]";
-        
+
         if (configuration.getTaskExecutor() != null) {
             if (log.isDebugEnabled()) {
                 log.debug("Using custom TaskExecutor: {} on listener 
container: {}", configuration.getTaskExecutor(), listenerContainer);
@@ -244,6 +244,10 @@ public class JmsEndpoint extends Default
      */
     public String getEndpointConfiguredDestinationName() {
         String remainder = ObjectHelper.after(getEndpointKey(), "//");
+        if (remainder != null && remainder.contains("?")) {
+            // remove parameters
+            remainder = ObjectHelper.before(remainder, "?");
+        }
         return JmsMessageHelper.normalizeDestinationName(remainder);
     }
 

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1200214&r1=1200213&r2=1200214&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 Thu Nov 10 08:38:28 2011
@@ -237,6 +237,7 @@ public class JmsEndpointConfigurationTes
         JmsEndpoint endpoint = (JmsEndpoint) 
resolveMandatoryEndpoint("jms:queue:Foo?idleConsumerLimit=51");
         assertEquals(51, endpoint.getIdleConsumerLimit());
         assertEquals(true, endpoint.isAutoStartup());
+        assertEquals("Foo", endpoint.getEndpointConfiguredDestinationName());
     }
 
     @Test
@@ -294,6 +295,7 @@ public class JmsEndpointConfigurationTes
         assertNull(endpoint.getTaskExecutor());
         assertNotNull(endpoint.getTemplateConnectionFactory());
         assertNull(endpoint.getTransactionManager());
+        assertEquals("Foo", endpoint.getEndpointConfiguredDestinationName());
 
         assertEquals(false, endpoint.isAcceptMessagesWhileStopping());
         assertEquals(false, endpoint.isAlwaysCopyMessage());