You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/07/24 20:43:39 UTC
git commit: CS-15676: Fix NPE when stop non-VPC router
Updated Branches:
refs/heads/vpc 1920c2a73 -> a00456bc5
CS-15676: Fix NPE when stop non-VPC router
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a00456bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a00456bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a00456bc
Branch: refs/heads/vpc
Commit: a00456bc57c1763a7117482cd0f5ec1712948b4b
Parents: 1920c2a
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jul 24 11:42:36 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Jul 24 11:43:30 2012 -0700
----------------------------------------------------------------------
.../VpcVirtualNetworkApplianceManagerImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a00456bc/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 622eb69..b9d972b 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1274,6 +1274,9 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
super.finalizeStop(profile, answer);
//Mark VPN connections as Disconnected
DomainRouterVO router = profile.getVirtualMachine();
- _s2sVpnMgr.markDisconnectVpnConnByVpc(router.getVpcId());
+ Long vpcId = router.getVpcId();
+ if (vpcId != null) {
+ _s2sVpnMgr.markDisconnectVpnConnByVpc(vpcId);
+ }
}
}