Fix VM creation when called by autoscale.

victor-mendes-eduardo · victor-mendes-eduardo · commit eaec5e5fcdcf · 2015-12-15T14:49:38.000-02:00
customParameters parameter is not passed by AutoScaleManager
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3164,8 +3164,10 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
                 }
 
                 _vmDao.persist(vm);
-                for (String key : customParameters.keySet()) {
-                    vm.setDetail(key, customParameters.get(key));
+                if (customParameters != null && customParameters.size() > 0) {
+                    for (String key : customParameters.keySet()) {
+                        vm.setDetail(key, customParameters.get(key));
+                    }
                 }
                 _vmDao.saveDetails(vm);
 

Original file line number	Diff line number	Diff line change
`@@ -3164,8 +3164,10 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap`
`3164`	`3164`	`}`
`3165`	`3165`
`3166`	`3166`	`_vmDao.persist(vm);`
`3167`		`- for (String key : customParameters.keySet()) {`
`3168`		`- vm.setDetail(key, customParameters.get(key));`
	`3167`	`+ if (customParameters != null && customParameters.size() > 0) {`
	`3168`	`+ for (String key : customParameters.keySet()) {`
	`3169`	`+ vm.setDetail(key, customParameters.get(key));`
	`3170`	`+ }`
`3169`	`3171`	`}`
`3170`	`3172`	`_vmDao.saveDetails(vm);`
`3171`	`3173`