diff options
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java')
-rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index a0e807801e..c2e1d2d3e7 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -128,6 +128,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements } }; + private final VaadinContext vaadinContext = new VaadinContext( + getDeploymentConfiguration()); + /** * Called by the servlet container to indicate to a servlet that the servlet * is being placed into service. @@ -166,6 +169,15 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements checkProductionMode(); checkCrossSiteProtection(); checkResourceCacheTime(); + + vaadinContext.init(); + } + + @Override + public void destroy() { + super.destroy(); + + vaadinContext.destroy(); } private void checkCrossSiteProtection() { |