svn commit: r1200217 - in /camel/branches/camel-2.8.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

[davsclaus]

Author: davsclaus
Date: Thu Nov 10 08:41:12 2011
New Revision: 1200217

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

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
    
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 08:41:12 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137,1199654,1199683,1199703,1199739,1199804
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137,1199654,1199683,1199703,1199739,1199804,1200214

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1200217&r1=1200216&r2=1200217&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 Thu Nov 10 08:41:12 2011
@@ -186,7 +186,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);
@@ -221,6 +221,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/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1200217&r1=1200216&r2=1200217&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
 Thu Nov 10 08:41:12 2011
@@ -233,6 +233,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
@@ -289,6 +290,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());