diff options
| author | Ilia Motornyi <elmot@vaadin.com> | 2018-06-18 13:32:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 13:32:03 +0200 |
| commit | 7294ab52fe8a5fd389bac22eeaeeb3cec4f82fbb (patch) | |
| tree | d67b6fb4bbb03edc1310262c89b5a987b3ddc517 /server | |
| parent | 4608a53c7acaeb46f4f6c89c3f81b2b7e6248164 (diff) | |
| download | vaadin-framework-7294ab52fe8a5fd389bac22eeaeeb3cec4f82fbb.tar.gz vaadin-framework-7294ab52fe8a5fd389bac22eeaeeb3cec4f82fbb.zip | |
Graceful servlet shutdown if no VaadinService is initialized (#10981)
Fixes #10980
Diffstat (limited to 'server')
| -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) { |