Fix NPE at undertow shutdown if not started properly

Author: adrienlauer

CHANGELOG.md

@@ -5,6 +5,7 @@
 * [new] SSL truststore can be configured separately from the master keystore (if no configuration it will default to the Java default truststore).
 * [new] A custom X509KeyManager can now be configured to allow control of the chosen key material during SSL handshake.
 * [brk] Plain file X509 certificates (outside a keystore) can no longer be configured as it is less secure and not so useful.
+* [fix] Remove NullPointerException a Undertow shutdown if the it had not started properly before.
 
 # Version 3.8.5 (2019-03-22)
 

web/undertow/src/main/java/org/seedstack/seed/undertow/internal/UndertowLauncher.java

@@ -113,7 +113,7 @@ private void createWorker(Coffig config) throws Exception {
 
                     .getMap());
         } catch (RuntimeException e) {
-            unwrapUndertowException(e);
+            throw unwrapUndertowException(e);
         }
     }
 
@@ -124,7 +124,7 @@ private void shutdownWorker() throws Exception {
                 xnioWorker.awaitTermination(2, TimeUnit.SECONDS);
             }
         } catch (RuntimeException e) {
-            unwrapUndertowException(e);
+            throw unwrapUndertowException(e);
         } finally {
             xnioWorker = null;
         }
@@ -141,17 +141,21 @@ private void deploy(Coffig configuration) throws Exception {
             deploymentManager.deploy();
             httpHandler = deploymentManager.start();
         } catch (RuntimeException e) {
-            unwrapUndertowException(e);
+            throw unwrapUndertowException(e);
         }
     }
 
     private void undeploy() throws Exception {
         if (deploymentManager != null) {
             try {
-                deploymentManager.stop();
-                deploymentManager.undeploy();
+                if (deploymentManager.getState() == DeploymentManager.State.STARTED) {
+                    deploymentManager.stop();
+                }
+                if (deploymentManager.getState() == DeploymentManager.State.DEPLOYED) {
+                    deploymentManager.undeploy();
+                }
             } catch (ServletException | RuntimeException e) {
-                unwrapUndertowException(e);
+                throw unwrapUndertowException(e);
             } finally {
                 httpHandler = null;
                 deploymentManager = null;
@@ -170,7 +174,7 @@ private void start() throws Exception {
             undertow.start();
             LOGGER.info("Undertow Web server started");
         } catch (RuntimeException e) {
-            unwrapUndertowException(e);
+            throw unwrapUndertowException(e);
         }
     }
 
@@ -180,7 +184,7 @@ private void stop() throws Exception {
                 undertow.stop();
                 LOGGER.info("Undertow Web server stopped");
             } catch (RuntimeException e) {
-                unwrapUndertowException(e);
+                throw unwrapUndertowException(e);
             } finally {
                 undertow = null;
             }
@@ -195,13 +199,13 @@ private UndertowPlugin getUndertowPlugin() {
                 .orElseThrow(() -> SeedException.createNew(UndertowErrorCode.MISSING_UNDERTOW_PLUGIN));
     }
 
-    private void unwrapUndertowException(Exception e) throws Exception {
+    private Exception unwrapUndertowException(Exception e) {
         if (e instanceof RuntimeException) {
             Throwable cause = e.getCause();
             if (cause instanceof Exception) {
-                throw Seed.translateException((Exception) cause);
+                return Seed.translateException((Exception) cause);
             }
         }
-        throw e;
+        return e;
     }
 }