JENKINS-32588 Unable to launch linux slaves using ec2 plugin using Eu…

…calyptus
jenkinsci · Jan 25, 2016 · c29c5f0 · c29c5f0
1 parent f95e3d5
commit c29c5f0
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/EC2Cloud.java b/src/main/java/hudson/plugins/ec2/EC2Cloud.java
@@ -291,17 +291,16 @@ private int countCurrentEC2Slaves(SlaveTemplate template) throws AmazonClientExc
             }
         }
         List<SpotInstanceRequest> sirs;
+        DescribeSpotInstanceRequestsRequest dsir = new DescribeSpotInstanceRequestsRequest();
         if (template != null) {
             List<Filter> filters = new ArrayList<Filter>();
             List<String> values = new ArrayList<String>();
             values.add(template.getAmi());
             filters.add(new Filter("launch.image-id", values));
-            DescribeSpotInstanceRequestsRequest dsir = new DescribeSpotInstanceRequestsRequest().withFilters(filters);
-            sirs = connect().describeSpotInstanceRequests(dsir).getSpotInstanceRequests();
-        } else {
-            sirs = connect().describeSpotInstanceRequests().getSpotInstanceRequests();
+            dsir = dsir.withFilters(filters);
         }
 
+        sirs = connect().describeSpotInstanceRequests(dsir).getSpotInstanceRequests();
         Set<SpotInstanceRequest> sirSet = new HashSet();
 
         for (SpotInstanceRequest sir : sirs) {