You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/05/30 23:07:12 UTC

svn commit: r661858 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java

Author: eae
Date: Fri May 30 14:07:12 2008
New Revision: 661858

URL: http://svn.apache.org/viewvc?rev=661858&view=rev
Log:
UIMA-1056 Jerry's fixes for complaints from findbugs.

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java?rev=661858&r1=661857&r2=661858&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java Fri May 30 14:07:12 2008
@@ -82,18 +82,7 @@
 
 		if ( endpoint != null && aController instanceof AggregateAnalysisEngineController )
 		{
-/*			
-      if ( isConnectionFailure( (Exception)t ) )
-      {
-        UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINE, CLASS_NAME.getName(),
-                "handleError", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_terminate_service__INFO",
-                new Object[] {aController.getComponentName(), endpoint.getEndpoint()});
-        aController.terminate();
-        aController.notifyListenersWithInitializationStatus((Exception)t);
-        return true;
-      }
-*/
-      Threshold threshold = super.getThreshold(endpoint, delegateMap, aController);
+			Threshold threshold = super.getThreshold(endpoint, delegateMap, aController);
 	    	String key = ((AggregateAnalysisEngineController)aController).lookUpDelegateKey(endpoint.getEndpoint());
 	    	//	If threshold is not defined, assume action=terminate
 	    	if (  threshold == null || threshold.getMaxRetries() == 0 || 
@@ -106,7 +95,6 @@
 	    			UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINE, CLASS_NAME.getName(),
 	    	                "handleError", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_terminate_service__INFO",
 	    	                new Object[] {aController.getComponentName(), endpoint.getEndpoint()});
-//	    			aController.propagateShutdownEventToTheTopComponent();
 	    			aController.terminate();
 	    			aController.notifyListenersWithInitializationStatus((Exception)t);
 	    		}