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/14 23:10:38 UTC

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

Author: cwiklik
Date: Tue Jul 14 21:10:38 2009
New Revision: 794065

URL: http://svn.apache.org/viewvc?rev=794065&view=rev
Log:
UIMA-1433 Modified stop() method to correct a bug introduced in the previous fix. The connectionMap contains instances of BrokerConnectionEndpoint not JmsEndopointConnection_impl.

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

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.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/JmsOutputChannel.java?rev=794065&r1=794064&r2=794065&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java Tue Jul 14 21:10:38 2009
@@ -1954,15 +1954,22 @@
 				
 				String key = (String)it.next();
 				Object value = connectionMap.get(key);
-				if ( value instanceof JmsEndpointConnection_impl )
+				
+				if ( value instanceof BrokerConnectionEntry )
 				{
-					endpointConnection = (JmsEndpointConnection_impl)value;
-					endpointConnection.abort();
-		      if ( UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) ) {
-		        UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(),
-		                    "stop", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_forced_endpoint_close__INFO",
-		                    new Object[] {getAnalysisEngineController().getName(),endpointConnection.getEndpoint(), endpointConnection.getServerUri() });
-		      }
+				  BrokerConnectionEntry brokerConnectionEntry = (BrokerConnectionEntry)value;
+					
+				  Iterator replyEndpointIterator = brokerConnectionEntry.endpointMap.keySet().iterator();
+				  while( replyEndpointIterator.hasNext()) {
+	          endpointConnection = brokerConnectionEntry.endpointMap.get(replyEndpointIterator.next());
+	          endpointConnection.abort();
+	          if ( UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) ) {
+	            UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(),
+	                        "stop", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_forced_endpoint_close__INFO",
+	                        new Object[] {getAnalysisEngineController().getName(),endpointConnection.getEndpoint(), endpointConnection.getServerUri() });
+	          }
+				    
+				  }
 				}
 			}
       if ( UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) ) {