From 232925f21fa0414984752ed26b25185972a8a30c Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Fri, 8 Sep 2017 10:31:17 +0100
Subject: [PATCH] fix npe that can occur with WinRM when no subnet IP, do a
 better job of returning public IP but above all don't NPE

---
 .../location/jclouds/JcloudsWinRmMachineLocation.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
index 127cfc65df..d49179137b 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
@@ -275,7 +275,10 @@ public String getSubnetIp() {
         if (privateAddress.isPresent()) {
             return privateAddress.get();
         }
-        if (groovyTruth(node.getPublicAddresses())) {
+        if (groovyTruth(publicAddresses)) {
+            return publicAddresses.iterator().next();
+        }
+        if (node!=null && groovyTruth(node.getPublicAddresses())) {
             return node.getPublicAddresses().iterator().next();
         }
         return null;