From 2b887cf970b8427de62762f36461b26e6edc787d Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Fri, 17 Jun 2016 17:08:06 -0700
Subject: [PATCH] fixing an NPE

---
 .../compute/implementation/VirtualMachineImpl.java  |  5 +++++
 .../compute/samples/ManageAvailabilitySet.java      | 13 +++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java
index 811ec8f5999c..7ebdf4c334fb 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java
@@ -4,6 +4,7 @@
 import com.microsoft.azure.CloudException;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.compute.AvailabilitySet;
 import com.microsoft.azure.management.compute.DataDisk;
 import com.microsoft.azure.management.compute.KnownLinuxVirtualMachineImage;
@@ -1075,6 +1076,10 @@ private void handleAvailabilitySettings() {
         }
 
         if (availabilitySet != null) {
+            if (this.inner().availabilitySet() == null) {
+                this.inner().withAvailabilitySet(new SubResource());
+            }
+
             this.inner().availabilitySet().withId(availabilitySet.id());
         }
     }
diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java
index 541d5ed61c5f..552d4a548aac 100644
--- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java
+++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java
@@ -1,4 +1,4 @@
-/**
+ /**
  *
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
@@ -64,6 +64,7 @@ public static void main(String[] args) {
             System.out.println("Selected subscription: " + azure.subscriptionId());
 
             try {
+
                 //=============================================================
                 // Create an availability set
 
@@ -71,14 +72,14 @@ public static void main(String[] args) {
 
                 AvailabilitySet availSet1 = azure.availabilitySets().define(availSetName1)
                         .withRegion(Region.US_EAST)
-                        .withNewGroup()
+                        .withNewGroup(rgName)
                         .withFaultDomainCount(2)
                         .withUpdateDomainCount(4)
                         .withTag("cluster", "Windowslinux")
                         .withTag("tag1", "tag1val")
                         .create();
 
-                System.out.println("Created first availability set:" + availSet1.id());
+                System.out.println("Created first availability set: " + availSet1.id());
                 Utils.print(availSet1);
 
 
@@ -123,7 +124,7 @@ public static void main(String[] args) {
                         .withExistingAvailabilitySet(availSet1)
                         .create();
 
-                System.out.println("Created second VM:" + vm2.id());
+                System.out.println("Created second VM: " + vm2.id());
                 Utils.print(vm2);
 
 
@@ -146,10 +147,10 @@ public static void main(String[] args) {
 
                 AvailabilitySet availSet2 = azure.availabilitySets().define(availSetName2)
                         .withRegion(Region.US_EAST)
-                        .withNewGroup()
+                        .withExistingGroup(rgName)
                         .create();
 
-                System.out.println("Created second availability set:" + availSet2.id());
+                System.out.println("Created second availability set: " + availSet2.id());
                 Utils.print(availSet2);