Repository: cloudstack Updated Branches: refs/heads/master f0e82f340 -> 86bf33bfa
CLOUDSTACK-7540: Fixed NPE in check s2svpn connection status Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86bf33bf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86bf33bf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86bf33bf Branch: refs/heads/master Commit: 86bf33bfabfeb84ce08dda3a3b0f8f313404db4c Parents: 3cb6d4a Author: Jayapal <jaya...@apache.org> Authored: Fri Sep 12 17:10:48 2014 +0530 Committer: Jayapal <jaya...@apache.org> Committed: Mon Sep 15 14:54:13 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86bf33bf/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java index 3ee5eac..50dfaf2 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; }
