From bdee5e37343f6f4e5be2acd6cbc6e172e0d1fe36 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 17 Sep 2014 10:32:23 +0200 Subject: [PATCH] CID-1233086: Fix potential NPE blowup in UserVmManagerImpl Signed-off-by: Rohit Yadav --- server/src/com/cloud/vm/UserVmManagerImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index b3252dbad06..2636096d03d 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2544,7 +2544,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + " as a part of deployVM process"); Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network", null, null, null, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null); - defaultNetwork = _networkDao.findById(newNetwork.getId()); + if (newNetwork != null) { + defaultNetwork = _networkDao.findById(newNetwork.getId()); + } } else if (virtualNetworks.size() > 1) { throw new InvalidParameterValueException("More than 1 default Isolated networks are found for account " + owner + "; please specify networkIds"); } else { @@ -2554,7 +2556,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); } - networkList.add(defaultNetwork); + if (defaultNetwork != null) { + networkList.add(defaultNetwork); + } } else { for (Long networkId : networkIdList) {