mgmt, fix containergroup npe when port protocol is null (#27234)

* fix npe for container group when port protocol is null * changelog * revert changelog
Azure · Feb 22, 2022 · c11f056 · c11f056
1 parent ff8345c
commit c11f056
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...n/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java b/...n/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java
@@ -19,6 +19,8 @@
 import com.azure.resourcemanager.containerinstance.models.ContainerGroupNetworkProtocol;
 import com.azure.resourcemanager.containerinstance.models.ContainerGroupRestartPolicy;
 import com.azure.resourcemanager.containerinstance.models.ContainerGroupSubnetId;
+import com.azure.resourcemanager.containerinstance.models.ContainerNetworkProtocol;
+import com.azure.resourcemanager.containerinstance.models.ContainerPort;
 import com.azure.resourcemanager.containerinstance.models.DnsConfiguration;
 import com.azure.resourcemanager.containerinstance.models.Event;
 import com.azure.resourcemanager.containerinstance.models.ImageRegistryCredential;
@@ -189,6 +191,13 @@ protected void initializeChildrenFromInner() {
         if (this.innerModel().containers() != null && this.innerModel().containers().size() > 0) {
             for (Container containerInstance : this.innerModel().containers()) {
                 this.containers.put(containerInstance.name(), containerInstance);
+                if (containerInstance.ports() != null) {
+                    for (ContainerPort port : containerInstance.ports()) {
+                        if (port.protocol() == null) {
+                            port.withProtocol(ContainerNetworkProtocol.TCP);
+                        }
+                    }
+                }
             }
         }
 
@@ -214,6 +223,9 @@ protected void initializeChildrenFromInner() {
             List<Port> tcpPorts = new ArrayList<>();
             List<Port> udpPorts = new ArrayList<>();
             for (Port port : this.innerModel().ipAddress().ports()) {
+                if (port.protocol() == null) {
+                    port.withProtocol(ContainerGroupNetworkProtocol.TCP);
+                }
                 if (port.protocol().equals(ContainerGroupNetworkProtocol.TCP)) {
                     tcpPorts.add(port);
                 } else if (port.protocol().equals(ContainerGroupNetworkProtocol.UDP)) {