Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50310

Ensure Servlet info is displayed in Manager application

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1037683 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 299209b..2c64903 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1720,7 +1720,7 @@ public class StandardWrapper extends ContainerBase
 
     private String getWebModuleKeyProperties() {
         
-        StringBuilder keyProperties = new StringBuilder(",WebModule=");
+        StringBuilder keyProperties = new StringBuilder(",WebModule=//");
         String hostName = getParent().getParent().getName();
         if (hostName == null) {
             keyProperties.append("DEFAULT");

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d73fc2f..678ca77 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -281,6 +281,10 @@
         Fix message not being displayed after session attribute removal in HTML
         Manager application. (markt)
       </fix>
+      <fix>
+        <bug>50310</bug>: Fix display of Servlet information in Manager
+        application. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">