Skip to content

Commit e5259f3

Browse files
author
Joshua Cold
committed
Merge remote-tracking branch 'upstream/master'
2 parents dda108d + b0a22d7 commit e5259f3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ private XmlElement createOrGetSettingElement(
13951395
if ( settingsElement == null )
13961396
{
13971397
settingsElement = xmlHelper.getXmlFactory().newElement( XML_ELEMENT_SETTINGS );
1398-
document.getRootElement().addContent( settingElement );
1398+
document.getRootElement().addContent( settingsElement );
13991399
}
14001400
settingsElement.addContent( settingElement );
14011401

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,11 +717,11 @@ private ProcessStatus handleComplete(
717717
return ProcessStatus.Halt;
718718
}
719719

720-
// log the user out if the current profiles states so
721-
final boolean forceLogoutOnChange = newUserProfile.readSettingAsBoolean( PwmSetting.NEWUSER_LOGOUT_AFTER_CREATION );
722-
if ( forceLogoutOnChange )
720+
// log the user out if the current profiles states so
721+
final boolean forceLogoutOnChange = newUserProfile.readSettingAsBoolean( PwmSetting.NEWUSER_LOGOUT_AFTER_CREATION );
722+
if ( forceLogoutOnChange )
723723
{
724-
LOGGER.trace( pwmSession, "logging out user; account created" );
724+
LOGGER.trace( pwmSession, () -> "logging out user; account created" );
725725
pwmRequest.sendRedirect( PwmServletDefinition.Logout );
726726
return ProcessStatus.Halt;
727727
}

webapp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@
265265
</dependency>
266266
<dependency>
267267
<groupId>javax.servlet.jsp</groupId>
268-
<artifactId>jsp-api</artifactId>
269-
<version>2.2.1-b03</version>
268+
<artifactId>javax.servlet.jsp-api</artifactId>
269+
<version>2.3.3</version>
270270
<scope>provided</scope>
271271
</dependency>
272272
<!-- / container dependencies -->

0 commit comments

Comments
 (0)