You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/03/01 21:32:51 UTC
svn commit: r1451710 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Author: challngr
Date: Fri Mar 1 20:32:51 2013
New Revision: 1451710
URL: http://svn.apache.org/r1451710
Log:
UIMA-2708
Omit unregistered services from the topological sort.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1451710&r1=1451709&r2=1451710&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java Fri Mar 1 20:32:51 2013
@@ -1157,7 +1157,9 @@ public class ServiceHandler
for ( String dep : deps ) {
ServiceSet sset = serviceStateHandler.getServiceByName(dep);
- clearEdges(sset, visited);
+ if ( sset != null ) {
+ clearEdges(sset, visited);
+ }
}
}
@@ -1168,6 +1170,7 @@ public class ServiceHandler
if ( deps != null ) {
for ( String d : deps ) {
ServiceSet outgoing = serviceStateHandler.getServiceByName(d);
+ if ( outgoing == null ) continue;
outgoing.setIncoming(node);
node.setOutgoing(outgoing);
edges++;