diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/server/VaadinServlet.java | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |