Repository: cloudstack Updated Branches: refs/heads/master 33a6640c0 -> c27dd6293
CID-1233085: Fix potential NPE in AccountManagerImpl from VpcManagerImpl Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c27dd629 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c27dd629 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c27dd629 Branch: refs/heads/master Commit: c27dd6293e6600e4253aa09b00d515a55ee533c1 Parents: 33a6640 Author: Rohit Yadav <[email protected]> Authored: Wed Sep 17 15:56:03 2014 +0200 Committer: Rohit Yadav <[email protected]> Committed: Wed Sep 17 15:56:03 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c27dd629/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index a45edea..c49da15 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1421,7 +1421,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis @Override public List<? extends Vpc> getVpcsForAccount(long accountId) { - return _vpcDao.listByAccountId(accountId); + List<Vpc> vpcs = new ArrayList<Vpc>(); + vpcs.addAll(_vpcDao.listByAccountId(accountId)); + return vpcs; } public boolean cleanupVpcResources(long vpcId, Account caller, long callerUserId) throws ResourceUnavailableException, ConcurrentOperationException {
