Author: eae
Date: Thu Jul 18 13:37:34 2019
New Revision: 1863293

URL: http://svn.apache.org/viewvc?rev=1863293&view=rev
Log:
UIMA-6097

Modified:
    
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1863293&r1=1863292&r2=1863293&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 Thu Jul 18 13:37:34 2019
@@ -1232,15 +1232,17 @@ public class Scheduler
     private NodePool findNodepoolByRule(NodeIdentity ni) {
        String location = "findNodepoolByRule";
        NodePool np = null;
+       NodePool testnp;
        try {
                String name1 = ni.getCanonicalName();
                String name2 = ni.getShortName();
                String ip = ni.getIp();
                logger.info(location, jobid, mapRules.size(), name1, name2, ip);
                for(String noderule : listRules) {
-                       np = mapRules.get(noderule);
+                       testnp = mapRules.get(noderule);
                        // match name with domain
                        if(name1.matches(noderule)) {
+                         np = testnp;
                                logger.info(location, jobid, "match by name: ", 
noderule, name1, np.getId());
                                break;
                        }
@@ -1249,6 +1251,7 @@ public class Scheduler
                        }
                        // match name without domain
                        if(name2.matches(noderule)) {
+              np = testnp;
                                logger.info(location, jobid, "match by name: ", 
noderule, name2, np.getId());
                                break;
                        }
@@ -1257,6 +1260,7 @@ public class Scheduler
                        }
                        // match ip
                        if(ip.matches(noderule)) {
+              np = testnp;
                                logger.info(location, jobid, "match by ip: ", 
noderule, ip,  np.getId());
                                break;
                        }


Reply via email to