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 2009/11/16 18:04:27 UTC

svn commit: r880851 - /incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java

Author: cwiklik
Date: Mon Nov 16 17:04:27 2009
New Revision: 880851

URL: http://svn.apache.org/viewvc?rev=880851&view=rev
Log:
UIMA-1665 removed code from handleAction() that was incorrectly incrementing a count of delegates responded to a request in a parallel step

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

Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=880851&r1=880850&r2=880851&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Mon Nov 16 17:04:27 2009
@@ -1127,31 +1127,6 @@
             forceTimeoutOnPendingCases(key);
           }
         }
-
-        if (endpoint != null) {
-          try {
-            // Fetch all Cas entries currently awaiting reply from the delegate that was just
-            // disabled. In case the delegate was in a parallel step, we need to adjust the
-            // the number of responses received to account for the failed delegate. This
-            // enables the processing to continue.
-            CacheEntry[] entries = getInProcessCache().getCacheEntriesForEndpoint(
-                    endpoint.getEndpoint());
-            if (entries != null) {
-              for (int i = 0; i < entries.length; i++) {
-                CasStateEntry cse = localCache.lookupEntry(entries[i].getCasReferenceId());
-                // Check if this is a parallel step
-                int parallelDelegateCount = cse.getNumberOfParallelDelegates();
-                // Check if all delegated responded
-                if (parallelDelegateCount > 1
-                        && cse.howManyDelegatesResponded() < parallelDelegateCount) {
-                  // increment responders
-                  cse.incrementHowManyDelegatesResponded();
-                }
-              }
-            }
-          } catch (Exception e) {
-          }
-        }
         if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
           UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(),
                   "handleAction", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,