You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2009/07/30 21:30:20 UTC

svn commit: r799422 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java

Author: cwiklik
Date: Thu Jul 30 19:30:20 2009
New Revision: 799422

URL: http://svn.apache.org/viewvc?rev=799422&view=rev
Log:
UIMA-1439 Reverted code back to only use custom Thread Factory if a listener is configured to run with more than one thread

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java?rev=799422&r1=799421&r2=799422&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java Thu Jul 30 19:30:20 2009
@@ -450,6 +450,7 @@
 	    // on its parent resulted in CAS Not Found In Cache Exception.
       //  Make sure Spring uses one thread
 	    super.setConcurrentConsumers(1);
+      if (cc > 1) {
 	    try {
 	      concurrentListener = new ConcurrentMessageListener(cc, ml);
 	      super.setMessageListener(concurrentListener);
@@ -459,20 +460,13 @@
 	    }
 	  } else {
       super.setMessageListener(ml);
-      super.setConcurrentConsumers(cc);
-	  }
-	  String messageSelector = __listenerRef.getMessageSelector();
-	  if (messageSelector == null ) {
-	    messageSelector = ":";
 	  }
-	  String listenerName = "ListenerGroup";
-	  
-	    if (isActiveMQDestination()) {
-	      listenerName +=":"+ ((ActiveMQDestination) getDestination()).getPhysicalName()+":"+messageSelector;
-      }
-	  
-      Thread t = new Thread( threadGroup, new Runnable() {
-	    public void run() {
+    } else {
+      super.setMessageListener(ml);
+      super.setConcurrentConsumers(cc);
+    }
+    Thread t = new Thread(threadGroup, new Runnable() {
+      public void run() {
         Destination destination = __listenerRef.getDestination();
         try {
           // Wait until the connection factory is injected by Spring