Author: fschumacher
Date: Fri Aug 10 10:08:54 2018
New Revision: 1837787
URL: http://svn.apache.org/viewvc?rev=1837787&view=rev
Log:
Simplify construction of appName from container name in JAASRealm.
There is no need to add a slash in front of the container name as
the method makeLegalForJAAS will strip it off directly afterwards.
That removes the need for a temporary variable.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1837787&r1=1837786&r2=1837787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Aug 10
10:08:54 2018
@@ -227,13 +227,7 @@ public class JAASRealm extends RealmBase
super.setContainer(container);
if( appName==null ) {
- String name = container.getName();
- if (!name.startsWith("/")) {
- name = "/" + name;
- }
- name = makeLegalForJAAS(name);
-
- appName=name;
+ appName = makeLegalForJAAS(container.getName());
log.info("Set JAAS app name " + appName);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837787&r1=1837786&r2=1837787&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:08:54 2018
@@ -106,6 +106,9 @@
<fix>
Use short circuit logic to prevent potential NPE in CorsFilter.
(fschumacher)
</fix>
+ <scode>
+ Simplify construction of appName from container name in JAASRealm.
(fschumacher)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
