Fix merging of pending and running client types

Consonance · Nov 4, 2015 · a800bb9 · a800bb9
1 parent 6f5d03e
commit a800bb9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ch/src/main/java/io/consonance/arch/containerProvisioner/ContainerProvisionerThreads.java b/...ch/src/main/java/io/consonance/arch/containerProvisioner/ContainerProvisionerThreads.java
@@ -224,10 +224,10 @@ public Void call() throws Exception {
                         // determine mix of VMs required
                         Map<String, Integer> clientTypes = new HashMap<>();
                         for(Job j : pendingJobs){
-                            clientTypes.merge(j.getFlavour(), 1, (k,v) -> (v+1));
+                            clientTypes.compute(j.getFlavour(), (k, v) -> (v == null ? 1 : v + 1));
                         }
                         for(Job j : runningJobs){
-                            clientTypes.merge(j.getFlavour(), 1, (k,v) -> (v+1));
+                            clientTypes.compute(j.getFlavour(), (k,v) -> (v == null? 1 : v+1));
                         }
 
                         // cap the number of VMs