[JENKINS-38196] Fixed method private String getHostToReserve(Label la…

…bel), which is also affected
jenkinsci · Sep 16, 2016 · fd68281 · fd68281
1 parent 3285da9
commit fd68281
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/src/main/java/com/redhat/foreman/ForemanSharedNodeCloud.java b/src/main/java/com/redhat/foreman/ForemanSharedNodeCloud.java
@@ -151,15 +151,9 @@ ForemanAPI getForemanAPI() {
     public boolean canProvision(Label label) {
         Map<String, String> hostsMap = getForemanAPI().getCompatibleHosts();
         Set<String> hosts = hostsMap.keySet();
-
-        if (label == null) {
-            return !hostsMap.isEmpty();
-        }
-
         for (String host: hosts) {
-            boolean match = label.matches(Label.parse(hostsMap.get(host)));
-            if (match) {
-                    return true;
+            if (label == null || label.matches(Label.parse(hostsMap.get(host)))) {
+                return true;
             }
         }
         return false;
@@ -284,11 +278,9 @@ private String getHostToReserve(Label label) {
         Map<String, String> hostsMap = getForemanAPI().getCompatibleHosts();
         Set<String> hosts = hostsMap.keySet();
         for (String host: hosts) {
-            boolean match = label.matches(Label.parse(hostsMap.get(host)));
-            if (match) {
-                if (getForemanAPI().isHostFree(host)) {
-                    return host;
-                }
+            if (getForemanAPI().isHostFree(host)
+                    && (label == null || label.matches(Label.parse(hostsMap.get(host))))) {
+                return host;
             }
         }
         return null;