fix: NPE with custom networks on shutdown.

Fixes #1097
fabric8io · Oct 1, 2018 · a725080 · a725080
1 parent d57c420
commit a725080
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/StopMojo.java b/src/main/java/io/fabric8/maven/docker/StopMojo.java
@@ -126,21 +126,24 @@ private Set<Network> getNetworksToRemove(QueryService queryService, GavLabel gav
         for (ImageConfiguration image : getResolvedImages()) {
 
             final NetworkConfig config = image.getRunConfiguration().getNetworkingConfig();
+            if (!config.isCustomNetwork() || config.getName() == null) {
+                continue;
+            }
             final Network network = getNetworkByName(networks, config.getCustomNetwork());
+            if (network == null) {
+                continue;
+            }
+            customNetworks.add(network);
+            Collection<Container> existingContainers =
+                ContainerNamingUtil.getContainersToStop(image,
+                                                        containerNamePattern,
+                                                        getBuildTimestamp(),
+                                                        queryService.getContainersForImage(image.getName(), false));
 
-            if (config.isCustomNetwork() && network != null) {
-                customNetworks.add(network);
-                Collection<Container> existingContainers =
-                    ContainerNamingUtil.getContainersToStop(image,
-                                                            containerNamePattern,
-                                                            getBuildTimestamp(),
-                                                            queryService.getContainersForImage(image.getName(), false));
-
-                for (Container container : existingContainers) {
-                    if (!shouldStopContainer(container, gavLabel)) {
-                        // it's sill in use don't collect it
-                        customNetworks.remove(network);
-                    }
+            for (Container container : existingContainers) {
+                if (!shouldStopContainer(container, gavLabel)) {
+                    // it's sill in use don't collect it
+                    customNetworks.remove(network);
                 }
             }
         }