Author: cwiklik
Date: Fri Jan  4 14:36:39 2019
New Revision: 1850369

URL: http://svn.apache.org/viewvc?rev=1850369&view=rev
Log:
UIMA-5784 include cause of failure when sending an exception back to client

Modified:
    
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java
    
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java

Modified: 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java?rev=1850369&r1=1850368&r2=1850369&view=diff
==============================================================================
--- 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java
 (original)
+++ 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/ControllerDelegate.java
 Fri Jan  4 14:36:39 2019
@@ -58,7 +58,7 @@ public class ControllerDelegate extends
   }
   public void handleError(Exception e, ErrorContext errorContext) {
     if (controller != null && controller.getErrorHandlerChain() != null) {
-      // Handle Timeout
+       // Handle Timeout
       controller.getErrorHandlerChain().handle(e, errorContext, controller);
     }
   }

Modified: 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java?rev=1850369&r1=1850368&r2=1850369&view=diff
==============================================================================
--- 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
 (original)
+++ 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
 Fri Jan  4 14:36:39 2019
@@ -834,7 +834,13 @@ public abstract class Delegate {
           delegate.setState(TIMEOUT_STATE);
           ErrorContext errorContext = new ErrorContext();
           errorContext.add(AsynchAEMessage.Command, aCommand);
-          String enrichedMessage = enrichProcessCASTimeoutMessage(aCommand, 
aCasReferenceId,timeToWait,"Delegate Service:"+delegateKey+" Has Timed Out 
While Processing CAS:"+aCasReferenceId );
+          String msg = "";
+          if ( aCommand == AsynchAEMessage.GetMeta ) {
+                 msg = "Delegate Service:"+delegateKey+" GetMeta Request Has 
Timed Out";
+          } else {
+                 msg = "Delegate Service:"+delegateKey+" Has Timed Out While 
Processing CAS:"+aCasReferenceId;
+          }
+          String enrichedMessage = enrichProcessCASTimeoutMessage(aCommand, 
aCasReferenceId,timeToWait, msg);
           Exception cause = new MessageTimeoutException(enrichedMessage);
           if ( aCasReferenceId != null ) {  // true on GetMeta Ping timeout
                 errorContext.add(AsynchAEMessage.CasReference, 
aCasReferenceId);


Reply via email to