You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/04 02:35:29 UTC
[10/50] [abbrv] git commit: CS-15274: Fix NPE on
CreateVlanIpRangeCmd()
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
Signed-off-by: Sheng Yang <sh...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0449ae37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0449ae37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0449ae37
Branch: refs/heads/vpc
Commit: 0449ae37f1112c680956a8ce5979f433456cbcb9
Parents: 9876d34
Author: Jason Bausewein <ja...@tier3.com>
Authored: Mon Jul 2 15:05:23 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Jul 2 15:05:57 2012 -0700
----------------------------------------------------------------------
.../configuration/ConfigurationManagerImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0449ae37/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index d64de24..a02c3be 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2132,6 +2132,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
if (network == null) {
if (zone.getNetworkType() == DataCenter.NetworkType.Basic) {
networkId = _networkMgr.getExclusiveGuestNetwork(zoneId).getId();
+ network = _networkMgr.getNetwork(networkId);
} else {
network = _networkMgr.getNetworkWithSecurityGroupEnabled(zoneId);
if (network == null) {