Fix 65404 - Manager status page was truncated
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java
index 7577932..d0a0454 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -337,11 +337,11 @@
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration =
- globalRequestProcessors.elements();
+ Enumeration<ObjectName> enumeration = globalRequestProcessors.elements();
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
while (enumeration.hasMoreElements()) {
ObjectName objectName = enumeration.nextElement();
- if (name.equals(objectName.getKeyProperty("name"))) {
+ if (name.equals(objectName.getKeyProperty("name")) && objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
}
@@ -407,11 +407,11 @@
ObjectName grpName = null;
- Enumeration<ObjectName> enumeration =
- globalRequestProcessors.elements();
+ Enumeration<ObjectName> enumeration = globalRequestProcessors.elements();
+ // Find the HTTP/1.1 RequestGroupInfo - BZ 65404
while (enumeration.hasMoreElements()) {
ObjectName objectName = enumeration.nextElement();
- if (name.equals(objectName.getKeyProperty("name"))) {
+ if (name.equals(objectName.getKeyProperty("name")) && objectName.getKeyProperty("Upgrade") == null) {
grpName = objectName;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index edfd1d2..9b9aeef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,12 @@
<bug>65385</bug>: Correct the link in the documentation web application
the Maven Central repository. (markt)
</fix>
+ <fix>
+ <bug>65404</bug>: Correct a regression in the fix for <bug>63362</bug>
+ that caused the server status page in the Manager web application to be
+ truncated if HTTP upgrade was used such as when starting a WebSocket
+ connection. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
