NullPointerException bugfix related to #1632 (#1678)

PAYARA-1764
payara · Jun 19, 2017 · 8fc3d5b · 8fc3d5b
1 parent 4b2c968
commit 8fc3d5b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...main/java/fish/payara/appserver/rest/endpoints/config/admin/ListRestEndpointsCommand.java b/...main/java/fish/payara/appserver/rest/endpoints/config/admin/ListRestEndpointsCommand.java
@@ -264,8 +264,10 @@ private List<WebModule> getWebModules(ApplicationInfo appInfo) {
             EngineRef engineRef = moduleInfo.getEngineRefForContainer(WebContainer.class);
             if (engineRef != null) {
                 WebApplication webApplication = (WebApplication) engineRef.getApplicationContainer();
-                for (WebModule module : webApplication.getWebModules()) {
-                    webModules.add(module);
+                if (webApplication != null) {
+                    for (WebModule module : webApplication.getWebModules()) {
+                        webModules.add(module);
+                    }
                 }
             }
         }