summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-12-20 09:31:47 +0200
committerLeif Åstrand <leif@vaadin.com>2011-12-20 09:31:47 +0200
commit405eb983bf103428c1372ebdc07b0329a68c9541 (patch)
treeeb8944336979e019c7104512089db4e6cc6781dd /src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
parent455202773f7a966b9fc4fc03acaec4bc09d108ee (diff)
downloadvaadin-framework-405eb983bf103428c1372ebdc07b0329a68c9541.tar.gz
vaadin-framework-405eb983bf103428c1372ebdc07b0329a68c9541.zip
Fix npe (#6619)
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java')
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 6ae80a65a5..afdaabcee0 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -198,6 +198,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
public void init(javax.servlet.ServletConfig servletConfig)
throws javax.servlet.ServletException {
super.init(servletConfig);
+ applicationProperties = new Properties();
// Read default parameters from server.xml
final ServletContext context = servletConfig.getServletContext();
@@ -209,7 +210,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
}
// Override with application config from web.xml
- applicationProperties = new Properties();
for (final Enumeration<String> e = servletConfig
.getInitParameterNames(); e.hasMoreElements();) {
final String name = e.nextElement();