cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [18/39] git commit: updated refs/heads/master to 3c800b4
Date Thu, 26 May 2016 03:05:57 GMT
Nuage VSP : Fix for NPE while cleaning up account when there are still resources belonging
to that account


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

Branch: refs/heads/master
Commit: d862a09771dca8d71da1727fdd09234d602d573b
Parents: 4b61799
Author: Nick Livens <nick.livens@nuagenetworks.net>
Authored: Mon May 2 10:16:21 2016 +0200
Committer: Nick Livens <nick.livens@nuagenetworks.net>
Committed: Tue May 24 11:12:19 2016 +0200

----------------------------------------------------------------------
 .../nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d862a097/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
b/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
index 135a552..8757ad0 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
@@ -109,7 +109,9 @@ public class NuageVspEntityBuilder {
         vspNetworkBuilder.domain(vspDomain);
 
         AccountVO account = _accountDao.findById(network.getAccountId());
-        vspNetworkBuilder.accountUuid(account.getUuid()).accountName(account.getAccountName());
+        if (account != null) {
+            vspNetworkBuilder.accountUuid(account.getUuid()).accountName(account.getAccountName());
+        }
 
         NetworkOfferingVO networkOffering = _networkOfferingDao.findById(network.getNetworkOfferingId());
         vspNetworkBuilder.egressDefaultPolicy(networkOffering.getEgressDefaultPolicy());


Mime
View raw message