You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/16 17:28:11 UTC

git commit: updated refs/heads/master to a1e8d5e

Repository: cloudstack
Updated Branches:
  refs/heads/master fbbd2f893 -> a1e8d5eef


CID-1233087: In case of no virtual routers, fail early

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


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

Branch: refs/heads/master
Commit: a1e8d5eefbbdf1398eba43b3078ef6e35ded7b71
Parents: fbbd2f8
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Sep 16 17:27:32 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Sep 16 17:27:32 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e8d5ee/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 8f6699e..b3252db 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2530,6 +2530,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
             if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) {
                 // get Virtual networks
                 List<? extends Network> virtualNetworks = _networkModel.listNetworksForAccount(owner.getId(), zone.getId(), Network.GuestType.Isolated);
+                if (virtualNetworks == null) {
+                    throw new InvalidParameterValueException("No (virtual) networks are found for account " + owner);
+                }
                 if (virtualNetworks.isEmpty()) {
                     long physicalNetworkId = _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType());
                     // Validate physical network