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 2014/03/06 15:48:27 UTC
svn commit: r1574898 - in
/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq:
JmsOutputChannel.java UimaDefaultMessageListenerContainer.java
Author: cwiklik
Date: Thu Mar 6 14:48:27 2014
New Revision: 1574898
URL: http://svn.apache.org/r1574898
Log:
UIMA-3646 handle exception thrown when stopping connection that has not been initialized
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java?rev=1574898&r1=1574897&r2=1574898&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java Thu Mar 6 14:48:27 2014
@@ -2004,8 +2004,11 @@ public class JmsOutputChannel implements
} finally {
try {
if ( brokerDestinations.endpointMap.isEmpty() ) {
- brokerDestinations.getConnection().stop();
- brokerDestinations.getConnection().close();
+ try {
+ brokerDestinations.getConnection().stop();
+ brokerDestinations.getConnection().close();
+ } catch( Exception e) {
+ }
brokerDestinations.setConnection(null);
brokerDestinations.endpointMap.clear();
connectionMap.remove(brokerDestinations);
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java?rev=1574898&r1=1574897&r2=1574898&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java Thu Mar 6 14:48:27 2014
@@ -1022,7 +1022,10 @@ public class UimaDefaultMessageListenerC
}
// Close Connection to the broker
String controllerName = (__listenerRef.controller == null) ? "" :__listenerRef.controller.getComponentName();
- __listenerRef.getSharedConnection().close();
+ try {
+ __listenerRef.getSharedConnection().close();
+ } catch( Exception ie) {
+ }
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(),
"destroy.run()", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,