Merge pull request #119 from RichLittlejohn/master

yuezk · web-flow · commit e5d911dce4b2 · 2023-12-12T13:19:31.000+08:00
Fixed bug #114 - Guard against NPE if shutdown port or plain HTTP connector can't be found.
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) {

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,12 @@ private void updateServerConf(Path confPath, TomcatRunConfiguration cfg)`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- portShutdown.setAttribute("port", String.valueOf(cfg.getAdminPort()));`
`200`		`- portE.setAttribute("port", String.valueOf(cfg.getPort()));`
	`199`	`+ if (portShutdown != null) {`
	`200`	`+ portShutdown.setAttribute("port", String.valueOf(cfg.getAdminPort()));`
	`201`	`+ }`
	`202`	`+ if (portE != null) {`
	`203`	`+ portE.setAttribute("port", String.valueOf(cfg.getPort()));`
	`204`	`+ }`
`201`	`205`	`Integer sslPort = cfg.getSslPort();`
`202`	`206`
`203`	`207`	`if (sslPortE != null && sslPort != null) {`