cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [15/18] git commit: updated refs/heads/resize-root to 6d6e790
Date Mon, 10 Mar 2014 21:37:43 GMT
CLOUDSTACK-6170


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1d74daf6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d74daf6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d74daf6

Branch: refs/heads/resize-root
Commit: 1d74daf6fe7c87931b6308d4e2e0e39f109a85ac
Parents: a1b778f
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Mon Mar 10 11:42:56 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Mon Mar 10 11:43:54 2014 -0600

----------------------------------------------------------------------
 .../apache/cloudstack/engine/orchestration/CloudOrchestrator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d74daf6/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
index 7969e43..fc1b85c 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
@@ -188,7 +188,7 @@ public class CloudOrchestrator implements OrchestrationService {
         rootDiskOfferingInfo.setDiskOffering(offering);
         rootDiskOfferingInfo.setSize(rootDiskSize);
 
-        if (offering.isCustomizedIops()) {
+        if (offering.isCustomizedIops() != null && offering.isCustomizedIops()) {
             Map<String, String> userVmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
 
             if (userVmDetails != null) {


Mime
View raw message