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/29 18:22:20 UTC
svn commit: r661384 - in
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main:
java/org/apache/uima/aae/error/handler/
java/org/apache/uima/aae/handler/input/ resources/
Author: eae
Date: Thu May 29 09:22:20 2008
New Revision: 661384
URL: http://svn.apache.org/viewvc?rev=661384&view=rev
Log:
UIMA-1050 Jerry's patch for this issue.
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/GetMetaErrorHandler.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties
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=661384&r1=661383&r2=661384&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 Thu May 29 09:22:20 2008
@@ -82,6 +82,7 @@
if ( endpoint != null && aController instanceof AggregateAnalysisEngineController )
{
+/*
if ( isConnectionFailure( (Exception)t ) )
{
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINE, CLASS_NAME.getName(),
@@ -91,7 +92,7 @@
aController.notifyListenersWithInitializationStatus((Exception)t);
return true;
}
-
+*/
Threshold threshold = super.getThreshold(endpoint, delegateMap, aController);
String key = ((AggregateAnalysisEngineController)aController).lookUpDelegateKey(endpoint.getEndpoint());
// If threshold is not defined, assume action=terminate
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java?rev=661384&r1=661383&r2=661384&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/handler/input/ProcessRequestHandler_impl.java Thu May 29 09:22:20 2008
@@ -277,6 +277,7 @@
}
// associate this subordinate CAS with the parent CAS
entry.setInputCasReferenceId(inputCasReferenceId);
+ entry.setReplyReceived();
}
DelegateStats stats = new DelegateStats();
if ( entry.getStat() == null )
@@ -521,6 +522,8 @@
getServicePerformance(newCASProducedBy).
incrementNumberOfCASesProcessed();
CacheEntry subordinateCasCacheEntry = getController().getInProcessCache().getCacheEntryForCAS(casReferenceId);
+ subordinateCasCacheEntry.setReplyReceived();
+
CacheEntry inputCasCacheEntry = getController().
getInProcessCache().
getCacheEntryForCAS(subordinateCasCacheEntry.getInputCasReferenceId());
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties?rev=661384&r1=661383&r2=661384&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties Thu May 29 09:22:20 2008
@@ -96,6 +96,8 @@
UIMAEE_invalid_endpoint__WARNING = Invalid reply. Unable to lookup endpoint: {0} Cas Reference Id: {1}
UIMAEE_no_consumers__INFO = No UIMA EE Service Delegates To Process Cas Reference Id: {0} Endpoint: {1}
UIMAEE_disabled_delegate_INFO = Aggregate Controller {0} Disabled Delegate Component: {1}
+UIMAEE_disabled_delegate_INFO = Aggregate Controller {0} Disabled Delegate Component: {1}
+UIMAEE_disabled_delegate_bad_broker__INFO = Aggregate Controller {0} Disabling Delegate Component:{1} Due To Invalid Broker: {2}
UIMAEE_invalid_request__INFO = Stale {0} Request
UIMAEE_recvd_cpc_reply__FINE = Received CPC Reply From Delegate: {0}
UIMAEE_send_cpc_req__FINE = Sending CPC Request To Delegate: {0}