Author: funkman
Date: Sun Sep 23 16:53:05 2007
New Revision: 578613
URL: http://svn.apache.org/viewvc?rev=578613&view=rev
Log:
bug 43453: ClassCastException at
org.apache.catalina.core.StandardContext.findStatusPage(int)
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?
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=578613&r1=578612&r2=578613&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun
Sep 23 16:53:05 2007
@@ -2938,7 +2938,11 @@
*/
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;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=578613&r1=578612&r2=578613&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Sep 23 16:53:05 2007
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
