Merge remote-tracking branch 'upstream/master'

server/src/main/java/password/pwm/config/stored/StoredConfigurationImpl.java

@@ -1395,7 +1395,7 @@ public class StoredConfigurationImpl implements StoredConfiguration
         if ( settingsElement == null )
         {
             settingsElement = xmlHelper.getXmlFactory().newElement( XML_ELEMENT_SETTINGS );
-            document.getRootElement().addContent( settingElement );
+            document.getRootElement().addContent( settingsElement );
         }
         settingsElement.addContent( settingElement );
 

server/src/main/java/password/pwm/http/servlet/newuser/NewUserServlet.java

@@ -717,11 +717,11 @@ public class NewUserServlet extends ControlledPwmServlet
                 return ProcessStatus.Halt;
             }
 
-        // log the user out if the current profiles states so
-        final boolean forceLogoutOnChange = newUserProfile.readSettingAsBoolean( PwmSetting.NEWUSER_LOGOUT_AFTER_CREATION );
-        if ( forceLogoutOnChange )
+            // log the user out if the current profiles states so
+            final boolean forceLogoutOnChange = newUserProfile.readSettingAsBoolean( PwmSetting.NEWUSER_LOGOUT_AFTER_CREATION );
+            if ( forceLogoutOnChange )
             {
-                LOGGER.trace( pwmSession, "logging out user; account created" );
+                LOGGER.trace( pwmSession, () -> "logging out user; account created" );
                 pwmRequest.sendRedirect( PwmServletDefinition.Logout );
                 return ProcessStatus.Halt;
             }

webapp/pom.xml

@@ -265,8 +265,8 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.2.1-b03</version>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>2.3.3</version>
             <scope>provided</scope>
         </dependency>
         <!-- / container dependencies -->