Updated Branches:
refs/heads/master c2b5c98de -> ff0a524bd
CLOUDSTACK-2969: Exception when creating vlan ip range
Description:
Putting in null pointer check when creating ip range.
Signed-off-by: Sateesh Chodapuneedi <sate...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff0a524b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff0a524b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff0a524b
Branch: refs/heads/master
Commit: ff0a524bd689cc89f7ca48db84e6591edcd7c47c
Parents: c2b5c98
Author: Vijayendra Bhamidipati <vijayendra.bhamidip...@citrix.com>
Authored: Wed Jun 12 06:34:02 2013 -0700
Committer: Sateesh Chodapuneedi <sate...@apache.org>
Committed: Thu Jun 13 11:07:12 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff0a524b/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 111586d..b684e01 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2528,7 +2528,7 @@ public class ConfigurationManagerImpl extends ManagerBase
implements Configurati
}
Transaction txn = Transaction.currentTxn();
txn.start();
- if (sameSubnet.first() == false) {
+ if (sameSubnet == null || sameSubnet.first() == false) {
s_logger.info("adding a new subnet to the network
"+network.getId());
}
else {
