From a00456bc57c1763a7117482cd0f5ec1712948b4b Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 24 Jul 2012 11:42:36 -0700
Subject: [PATCH] CS-15676: Fix NPE when stop non-VPC router

---
 .../router/VpcVirtualNetworkApplianceManagerImpl.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 622eb690c54..b9d972b5939 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);
+        }
     }
 }