Fixed NPE deferring saving of properties at the end of the configuration process.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@158 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/setup-datasource-settings.jsp

@@ -31,15 +31,6 @@
     // handle a mode redirect
     Map errors = new HashMap();
     if (next) {
-        // First, update with XMPPSettings
-        Map xmppSettings = (Map)session.getAttribute("xmppSettings");
-        Iterator iter = xmppSettings.keySet().iterator();
-        while(iter.hasNext()){
-            String name = (String)iter.next();
-            String value = (String)xmppSettings.get(name);
-            JiveGlobals.setProperty(name, value);
-        }
-        
         if (STANDARD.equals(mode)) {
             response.sendRedirect("setup-datasource-standard.jsp");
             return;

src/web/setup-finished.jsp

@@ -12,10 +12,22 @@
                  org.jivesoftware.messenger.container.ServiceLookupFactory,
                  org.jivesoftware.messenger.auth.UnauthorizedException,
                  org.jivesoftware.messenger.JiveGlobals,
-                 org.jivesoftware.messenger.XMPPBootContainer"
+                 org.jivesoftware.messenger.XMPPBootContainer,
+                 java.util.Map,
+                 java.util.Iterator"
 %>
 
-<%  boolean showSidebar = false; %>
+<%  boolean showSidebar = false;
+        // First, update with XMPPSettings
+        Map xmppSettings = (Map)session.getAttribute("xmppSettings");
+        Iterator iter = xmppSettings.keySet().iterator();
+        while(iter.hasNext()){
+            String name = (String)iter.next();
+            String value = (String)xmppSettings.get(name);
+            JiveGlobals.setProperty(name, value);
+        }
+
+%>
 
 <%@ include file="setup-header.jspf" %>