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 2010/08/09 17:49:46 UTC
svn commit: r983697 -
/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java
Author: cwiklik
Date: Mon Aug 9 15:49:45 2010
New Revision: 983697
URL: http://svn.apache.org/viewvc?rev=983697&view=rev
Log:
UIMA-1855 modified retryLasCommand() to return false if aController instance == null
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java?rev=983697&r1=983696&r2=983697&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorHandlerBase.java Mon Aug 9 15:49:45 2010
@@ -189,6 +189,10 @@ public abstract class ErrorHandlerBase {
AnalysisEngineController aController, String aKey, Threshold aThreshold,
ErrorContext anErrorContext) {
boolean done = false;
+
+ if ( aController == null ) {
+ return false;
+ }
String errorCounterKind = (aRetryCommand == AsynchAEMessage.GetMeta) ? Monitor.GetMetaErrorRetryCount
: Monitor.ProcessErrorRetryCount;
// Handle errors in a loop. Retry until retry threshold is reached
@@ -235,11 +239,9 @@ public abstract class ErrorHandlerBase {
} catch (Exception e) {
anEndpoint.cancelTimer();
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
- if ( aController != null ) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
"retryLastCommand", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_service_exception_WARNING", aController.getComponentName());
- }
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, getClass().getName(),
"retryLastCommand", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,