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/10 23:02:28 UTC

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

Author: cwiklik
Date: Tue Nov 10 22:02:27 2009
New Revision: 834693

URL: http://svn.apache.org/viewvc?rev=834693&view=rev
Log:
UIMA-1656 Modified to check the state of an aggregate before sending GetMeta request to a remote delegate

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

Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=834693&r1=834692&r2=834693&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Tue Nov 10 22:02:27 2009
@@ -1328,7 +1328,7 @@
       delegateEndpoints[indx++] = (Endpoint) destinationMap.get((String) it.next());
     }
     // Now send GetMeta request to all remote delegates
-    for (int i = 0; i < delegateEndpoints.length; i++) {
+    for (int i = 0; !isStopped() && i < delegateEndpoints.length; i++) {
       if (delegateEndpoints[i].isRemote()) {
         delegateEndpoints[i].initialize();
         delegateEndpoints[i].setController(this);
@@ -1377,7 +1377,7 @@
           if (isStopped()) {
             return;
           }
-          if (delegateEndpoints[i].getStatus() == Endpoint.OK) {
+          if (delegateEndpoints[i].getStatus() == Endpoint.OK ) {
             dispatchMetadataRequest(delegateEndpoints[i]);
           }
         }
@@ -2289,7 +2289,7 @@
   }
 
   public PrimitiveServiceInfo getDelegateServiceInfo(String aDelegateKey) {
-    if (delegateStatMap.containsKey(aDelegateKey) == false) {
+    if (delegateStatMap == null || aDelegateKey == null || delegateStatMap.containsKey(aDelegateKey) == false) {
       return null;
     }
     Object[] delegateStats;