From 7294ab52fe8a5fd389bac22eeaeeb3cec4f82fbb Mon Sep 17 00:00:00 2001
From: Ilia Motornyi <elmot@vaadin.com>
Date: Mon, 18 Jun 2018 13:32:03 +0200
Subject: Graceful servlet shutdown if no VaadinService is initialized (#10981)

Fixes #10980
---
 server/src/main/java/com/vaadin/server/VaadinServlet.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index ec4c425ff5..a32b1f5067 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java
@@ -1436,7 +1436,9 @@ public class VaadinServlet extends HttpServlet implements Constants {
     @Override
     public void destroy() {
         super.destroy();
-        getService().destroy();
+        if (getService() != null) {
+            getService().destroy();
+        }
     }
 
     private static void persistCacheEntry(ScssCacheEntry cacheEntry) {
-- 
cgit v1.2.3