Author: cwiklik Date: Thu Jan 19 17:25:22 2012 New Revision: 1233487 URL: http://svn.apache.org/viewvc?rev=1233487&view=rev Log: UIMA-2351 Removed busy loop that waited for AMQ threads to finish
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java?rev=1233487&r1=1233486&r2=1233487&view=diff ============================================================================== --- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java (original) +++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java Thu Jan 19 17:25:22 2012 @@ -1113,28 +1113,7 @@ public class JmsInputChannel implements "UIMAJMS_stop_listener__INFO", new Object[] { mListener.getDestination().toString() }); } - // Spin a thread that will stop the listener and wait for its shutdown - Thread stopThread = new Thread("InputChannelStopThread") { - public void run() { - mListener.stop(); - // wait until the listener shutsdown - while (mListener.isRunning()) - ; - if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) - && mListener.getDestination() != null) { - UIMAFramework.getLogger(CLASS_NAME).logrb( - Level.INFO, - CLASS_NAME.getName(), - "destroyListener", - JmsConstants.JMS_LOG_RESOURCE_BUNDLE, - "UIMAJMS_stopped_listener_INFO", - new Object[] { controller.getComponentName(), - mListener.getDestination().toString() }); - } - } - }; - stopThread.start(); - + mListener.stop(); if (getController() != null) { Endpoint endpoint = ((AggregateAnalysisEngineController) getController()).lookUpEndpoint( aDelegateKey, false); @@ -1148,7 +1127,6 @@ public class JmsInputChannel implements } } } - // } } catch (Exception e) { if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) { UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),