brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/2] brooklyn-server git commit: Add null checks to Azure default network
Date Thu, 20 Jul 2017 13:44:56 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 033b8733b -> 211e3dcf2


Add null checks to Azure default network


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/25fef968
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/25fef968
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/25fef968

Branch: refs/heads/master
Commit: 25fef9685ed2e627bead26b56ae663752bf2a940
Parents: ef5e60f
Author: graeme.miller <graeme.miller@cloudsoftcorp.com>
Authored: Thu Jul 20 14:15:06 2017 +0100
Committer: graeme.miller <graeme.miller@cloudsoftcorp.com>
Committed: Thu Jul 20 14:15:06 2017 +0100

----------------------------------------------------------------------
 .../jclouds/networking/creator/DefaultAzureArmNetworkCreator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25fef968/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
index 6028280..885690f 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/creator/DefaultAzureArmNetworkCreator.java
@@ -138,7 +138,7 @@ public class DefaultAzureArmNetworkCreator {
 
         //Wait until subnet is created
         CountdownTimer timeout = CountdownTimer.newInstanceStarted(Duration.minutes(new Integer(20)));
-        while (PROVISIONING_STATE_UPDATING.equals(createdSubnet.properties().provisioningState()))
{
+        while (createdSubnet == null || createdSubnet.properties()  == null || PROVISIONING_STATE_UPDATING.equals(createdSubnet.properties().provisioningState()))
{
             if (timeout.isExpired()) {
                 throw new IllegalStateException("Creating subnet " + subnetName + " stuck
in the updating state, aborting.");
             }


Mime
View raw message