From 86bf33bfabfeb84ce08dda3a3b0f8f313404db4c Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Fri, 12 Sep 2014 17:10:48 +0530
Subject: [PATCH] CLOUDSTACK-7540: Fixed NPE in check s2svpn connection status

---
 .../com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index 3ee5eac3a78..50dfaf202f9 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -60,7 +60,12 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
 
     public boolean isConnected(String ip) {
         if (this.getResult()) {
-            return ipToConnected.get(ip);
+            Boolean status = ipToConnected.get(ip);
+
+            if (status != null) {
+                return status;
+            }
+
         }
         return false;
     }