Repository: jclouds-labs Updated Branches: refs/heads/2.0.x 624155af1 -> 7611db874
Fix NPE in ARM VirtualMachineToNodeMetadata Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7611db87 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7611db87 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7611db87 Branch: refs/heads/2.0.x Commit: 7611db874e44b2e96a544d2fe0bc8ee941e2cfbc Parents: 624155a Author: Ignasi Barrera <[email protected]> Authored: Thu Feb 16 16:10:24 2017 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Thu Feb 16 16:10:24 2017 +0100 ---------------------------------------------------------------------- .../arm/compute/functions/VirtualMachineToNodeMetadata.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7611db87/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java index 26bf985..6b7ef30 100644 --- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java +++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VirtualMachineToNodeMetadata.java @@ -41,6 +41,7 @@ import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.domain.IdReference; import org.jclouds.azurecompute.arm.domain.IpConfiguration; import org.jclouds.azurecompute.arm.domain.NetworkInterfaceCard; +import org.jclouds.azurecompute.arm.domain.PublicIPAddress; import org.jclouds.azurecompute.arm.domain.RegionAndId; import org.jclouds.azurecompute.arm.domain.ResourceGroup; import org.jclouds.azurecompute.arm.domain.StorageProfile; @@ -247,8 +248,10 @@ public class VirtualMachineToNodeMetadata implements Function<VirtualMachine, No for (IpConfiguration ipConfiguration : networkInterfaceCard.properties().ipConfigurations()) { if (ipConfiguration.properties().publicIPAddress() != null) { String publicIpId = ipConfiguration.properties().publicIPAddress().id(); - publicIpAddresses.add(api.getPublicIPAddressApi(resourceGroup) - .get(Iterables.getLast(Splitter.on("/").split(publicIpId))).properties().ipAddress()); + PublicIPAddress publicIp = api.getPublicIPAddressApi(resourceGroup).get(Iterables.getLast(Splitter.on("/").split(publicIpId))); + if (publicIp != null && publicIp.properties().ipAddress() != null) { + publicIpAddresses.add(publicIp.properties().ipAddress()); + } } } }
