From 27a211669f51e0ef82a1fc757069ce6abb817c85 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <fschumacher@apache.org>
Date: Fri, 10 Aug 2018 10:08:54 +0000
Subject: [PATCH] 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.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1837787 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/realm/JAASRealm.java | 8 +-------
 webapps/docs/changelog.xml                    | 3 +++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/realm/JAASRealm.java b/java/org/apache/catalina/realm/JAASRealm.java
index cb04899d54a9..0f3185cb9d54 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -227,13 +227,7 @@ public void setContainer(Container container) {
         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);
         }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 479f70d74f9b..885477ba9b02 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">