cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/hotfix/broken-simulator to 08978c3
Date Tue, 05 Aug 2014 09:50:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/hotfix/broken-simulator 972ff0ce2 -> 08978c348


Improve the error message to see what is going on


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

Branch: refs/heads/hotfix/broken-simulator
Commit: 08978c348d5655c4560fc61fa73a5b9bb9d12eb3
Parents: 972ff0c
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Tue Aug 5 11:50:12 2014 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue Aug 5 11:50:12 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08978c34/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index b51e8ac..d559050 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2723,7 +2723,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Vir
             hypervisorType = hypervisor;
         } else {
             if (hypervisor != null && hypervisor != HypervisorType.None &&
hypervisor != template.getHypervisorType()) {
-                throw new InvalidParameterValueException("Hypervisor passed to the deployVm
call, is different from the hypervisor type of the template");
+                throw new InvalidParameterValueException("Hypervisor passed to the deployVm
call ( " + hypervisor.toString()
+                        + " ), is different from the hypervisor type of the template ( "
+ template.getHypervisorType().toString() + " )");
             }
             hypervisorType = template.getHypervisorType();
         }


Mime
View raw message