Merge pull request #119 from RichLittlejohn/master

Fixed bug #114 - Guard against NPE if shutdown port or plain HTTP connector can't be found.
zengkid · Dec 12, 2023 · e5d911d · e5d911d
2 parents 82bfe29 + df82f50
commit e5d911d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/poratu/idea/plugins/tomcat/conf/TomcatCommandLineState.java b/src/main/java/com/poratu/idea/plugins/tomcat/conf/TomcatCommandLineState.java
@@ -196,8 +196,12 @@ private void updateServerConf(Path confPath, TomcatRunConfiguration cfg)
             }
         }
 
-        portShutdown.setAttribute("port", String.valueOf(cfg.getAdminPort()));
-        portE.setAttribute("port", String.valueOf(cfg.getPort()));
+        if (portShutdown != null) {
+            portShutdown.setAttribute("port", String.valueOf(cfg.getAdminPort()));
+        }
+        if (portE != null) {
+            portE.setAttribute("port", String.valueOf(cfg.getPort()));
+        }
         Integer sslPort = cfg.getSslPort();
 
         if (sslPortE != null && sslPort != null) {