Skip to content

Commit c11f056

Browse files
authored
mgmt, fix containergroup npe when port protocol is null (Azure#27234)
* fix npe for container group when port protocol is null * changelog * revert changelog
1 parent ff8345c commit c11f056

File tree

1 file changed

+12
-0
lines changed
  • sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation

1 file changed

+12
-0
lines changed

sdk/resourcemanager/azure-resourcemanager-containerinstance/src/main/java/com/azure/resourcemanager/containerinstance/implementation/ContainerGroupImpl.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.azure.resourcemanager.containerinstance.models.ContainerGroupNetworkProtocol;
2020
import com.azure.resourcemanager.containerinstance.models.ContainerGroupRestartPolicy;
2121
import com.azure.resourcemanager.containerinstance.models.ContainerGroupSubnetId;
22+
import com.azure.resourcemanager.containerinstance.models.ContainerNetworkProtocol;
23+
import com.azure.resourcemanager.containerinstance.models.ContainerPort;
2224
import com.azure.resourcemanager.containerinstance.models.DnsConfiguration;
2325
import com.azure.resourcemanager.containerinstance.models.Event;
2426
import com.azure.resourcemanager.containerinstance.models.ImageRegistryCredential;
@@ -189,6 +191,13 @@ protected void initializeChildrenFromInner() {
189191
if (this.innerModel().containers() != null && this.innerModel().containers().size() > 0) {
190192
for (Container containerInstance : this.innerModel().containers()) {
191193
this.containers.put(containerInstance.name(), containerInstance);
194+
if (containerInstance.ports() != null) {
195+
for (ContainerPort port : containerInstance.ports()) {
196+
if (port.protocol() == null) {
197+
port.withProtocol(ContainerNetworkProtocol.TCP);
198+
}
199+
}
200+
}
192201
}
193202
}
194203

@@ -214,6 +223,9 @@ protected void initializeChildrenFromInner() {
214223
List<Port> tcpPorts = new ArrayList<>();
215224
List<Port> udpPorts = new ArrayList<>();
216225
for (Port port : this.innerModel().ipAddress().ports()) {
226+
if (port.protocol() == null) {
227+
port.withProtocol(ContainerGroupNetworkProtocol.TCP);
228+
}
217229
if (port.protocol().equals(ContainerGroupNetworkProtocol.TCP)) {
218230
tcpPorts.add(port);
219231
} else if (port.protocol().equals(ContainerGroupNetworkProtocol.UDP)) {

0 commit comments

Comments
 (0)