bug 43453: ClassCastException at org.apache.catalina.core.StandardContext.findStatus...

In reality - I don't see anywhere that calls findStatusPage(). Is there a chance (in the future)
to drop this method from StandardContext as well as the Context interface?

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 3f893c0..3b92a98 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2938,7 +2938,11 @@ public class StandardContext
      */
     public String findStatusPage(int status) {
 
-        return ((String) statusPages.get(new Integer(status)));
+        ErrorPage errorPage = (ErrorPage)statusPages.get(new Integer(status));
+        if (errorPage!=null) {
+            return errorPage.getLocation();
+        }
+        return null;
 
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 66ce17d..837f44d 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,7 +100,12 @@
       </fix>
       <fix>
         <bug>41797</bug>: CNFE/NPE thrown from function mapper when externalizing
-        Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+        Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi (funkman)
+      </fix>
+      <fix>
+        <bug>43453</bug>: ClassCastException at 
+        org.apache.catalina.core.StandardContext.findStatusPage(int)
+         (funkman)
       </fix>
     </changelog>
   </subsection>