Author: markt Date: Fri Jul 3 14:59:01 2015 New Revision: 1689034 URL: http://svn.apache.org/r1689034 Log: Fix NPE on empty realm name Patch by fjodorver
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java?rev=1689034&r1=1689033&r2=1689034&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java Fri Jul 3 14:59:01 2015 @@ -66,7 +66,7 @@ public abstract class TomcatAuthModule i public String getRealmName() { - return Optional.of(realmName).orElse(DEFAULT_REALM_NAME); + return Optional.ofNullable(realmName).orElse(DEFAULT_REALM_NAME); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org