You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2015/10/20 16:33:11 UTC
svn commit: r1709613 -
/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java
Author: remm
Date: Tue Oct 20 14:33:11 2015
New Revision: 1709613
URL: http://svn.apache.org/viewvc?rev=1709613&view=rev
Log:
Avoid null realm "name". Based on a patch by Fjodor Vershinin.
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=1709613&r1=1709612&r2=1709613&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 Tue Oct 20 14:33:11 2015
@@ -19,7 +19,6 @@ package org.apache.catalina.authenticato
import java.io.IOException;
import java.security.Principal;
import java.util.Map;
-import java.util.Optional;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
@@ -52,7 +51,7 @@ public abstract class TomcatAuthModule i
*/
protected static final StringManager sm = StringManager.getManager(TomcatAuthModule.class);
- protected String realmName;
+ protected String realmName = DEFAULT_REALM_NAME;
protected CallbackHandler handler;
@@ -77,13 +76,16 @@ public abstract class TomcatAuthModule i
public final void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy,
CallbackHandler handler, Map options) throws AuthException {
this.handler = handler;
- this.realmName = (String) options.get(REALM_NAME);
+ String name = (String) options.get(REALM_NAME);
+ if (name != null) {
+ this.realmName = name;
+ }
initializeModule(requestPolicy, responsePolicy, handler, options);
}
public String getRealmName() {
- return Optional.ofNullable(realmName).orElse(DEFAULT_REALM_NAME);
+ return realmName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org