svn commit: r1461143 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java

[cwiklik]

Author: cwiklik
Date: Tue Mar 26 14:13:21 2013
New Revision: 1461143

URL: http://svn.apache.org/r1461143
Log:
UIMA-2651 Drop CAS if unable to deliver it to a client

Modified:
    
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java

Modified: 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: 
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=1461143&r1=1461142&r2=1461143&view=diff
==============================================================================
--- 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
 (original)
+++ 
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
 Tue Mar 26 14:13:21 2013
@@ -1732,8 +1732,20 @@ public class AggregateAnalysisEngineCont
         // If the CAS was generated by this component but the Flow Controller 
wants to drop it OR
         // this component
         // is not a Cas Multiplier
+        
+        
+        UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, 
CLASS_NAME.getName(),
+                    "finalStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
+                    "UIMAEE_drop_cas_debug_FINEST",
+                    new Object[] { getComponentName(), 
aStep.getForceCasToBeDropped(), aCasReferenceId, 
casStateEntry.isReplyReceived() });
+        
         if (forceToDropTheCas(parentCasStateEntry, cacheEntry, aStep)) {
-          if (casStateEntry.isReplyReceived()) {
+               
+               
+            
+   
+               
+               if (casStateEntry.isReplyReceived()) {
             if (isSubordinate) {
               // drop the flow since we no longer need it
               dropFlow(aCasReferenceId, true);
@@ -2066,7 +2078,8 @@ public class AggregateAnalysisEngineCont
     // the CAS is a child but there was a failure delivering it to a client. 
The client
     // may have terminated while its input CAS was being processed, for 
example. 
     // If this CAS has a parent the client will send Release CAS notification 
to release the CAS.
-    if (!casStateEntry.isSubordinate() || (casStateEntry.isSubordinate() && 
isCasMultiplier() && casStateEntry.deliveryToClientFailed() )) {
+    if (!casStateEntry.isSubordinate() || (casStateEntry.isSubordinate() && 
isCasMultiplier() && 
+               casStateEntry.deliveryToClientFailed() )) {
        if ( cmOutstandingCASes.containsKey(casStateEntry.getCasReferenceId())) 
{
                  cmOutstandingCASes.remove(casStateEntry.getCasReferenceId());
        }
@@ -2191,7 +2204,7 @@ public class AggregateAnalysisEngineCont
               "replyToClient",
               UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMAEE_final_step__FINEST",
-              new Object[] { casStateEntry.getCasReferenceId(),
+              new Object[] { getComponentName(), 
casStateEntry.getCasReferenceId(),
                   (double) (System.nanoTime() - endpoint.getEntryTime()) / 
(double) 1000000 });
     }
     endpoint.setFinal(true);