diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-12-20 09:31:47 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-12-20 09:31:47 +0200 |
| commit | 405eb983bf103428c1372ebdc07b0329a68c9541 (patch) | |
| tree | eb8944336979e019c7104512089db4e6cc6781dd | |
| parent | 455202773f7a966b9fc4fc03acaec4bc09d108ee (diff) | |
| download | vaadin-framework-405eb983bf103428c1372ebdc07b0329a68c9541.tar.gz vaadin-framework-405eb983bf103428c1372ebdc07b0329a68c9541.zip | |
Fix npe (#6619)
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index 18642b5d18..7b8b146075 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -298,6 +298,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet @Override public void init(PortletConfig config) throws PortletException { super.init(config); + applicationProperties = new Properties(); // Read default parameters from the context final PortletContext context = config.getPortletContext(); @@ -309,7 +310,6 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet } // Override with application settings from portlet.xml - applicationProperties = new Properties(); for (final Enumeration<String> e = config.getInitParameterNames(); e .hasMoreElements();) { final String name = e.nextElement(); 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(); |