Author: cwiklik Date: Fri Jul 20 20:55:37 2012 New Revision: 1363952 URL: http://svn.apache.org/viewvc?rev=1363952&view=rev Log: UIMA-2437 Modified to catch an exception in stop() and log it
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=1363952&r1=1363951&r2=1363952&view=diff ============================================================================== --- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original) +++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Fri Jul 20 20:55:37 2012 @@ -231,7 +231,7 @@ public class BaseUIMAAsynchronousEngine_ sharedConnection.unregisterClient(this); ActiveMQConnection amqc = (ActiveMQConnection)sharedConnection.getConnection(); // Delete client's temp reply queue from AMQ Broker - if ( amqc != null && !amqc.isClosed() && consumerDestination != null && + if ( amqc != null && !amqc.isClosed() && !amqc.isClosing() && consumerDestination != null && consumerDestination instanceof ActiveMQTempDestination ) { try { amqc.deleteTempDestination((ActiveMQTempDestination)consumerDestination); @@ -290,7 +290,17 @@ public class BaseUIMAAsynchronousEngine_ JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_client_interrupted_while_acquiring_semaphore__WARNING"); } - } finally { + } catch( Exception ex ) { + if (UIMAFramework.getLogger(CLASS_NAME).isLoggable( + Level.WARNING)) { + UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, + CLASS_NAME.getName(), "stop", + JmsConstants.JMS_LOG_RESOURCE_BUNDLE, + "UIMAJMS_exception__WARNING",ex); + } + + } + finally { sharedConnectionSemaphore.release(); } // Undeploy all containers