From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 20 Dec 2011 07:31:47 +0000 (+0200)
Subject: Fix npe (#6619)
X-Git-Tag: 7.0.0.alpha1~87
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=405eb983bf103428c1372ebdc07b0329a68c9541;p=vaadin-framework.git

Fix npe (#6619)
---

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();