svn commit: r1355554 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[markt]

Author: markt
Date: Fri Jun 29 20:36:49 2012
New Revision: 1355554

URL: http://svn.apache.org/viewvc?rev=1355554&view=rev
Log:
Remove unnecessary special case handling for 200 since we now only check status 
error pages is sendError has been used.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1355554&r1=1355553&r2=1355554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Jun 29 
20:36:49 2012
@@ -457,12 +457,6 @@ public class StandardContext extends Con
         new HashMap<String, String>();
 
 
-     /**
-      * Special case: error page for status 200.
-      */
-     private ErrorPage okErrorPage = null;
-
-
     /**
      * The context initialization parameters for this web application,
      * keyed by name.
@@ -2832,9 +2826,6 @@ public class StandardContext extends Con
             }
         } else {
             synchronized (statusPages) {
-                if (errorPage.getErrorCode() == 200) {
-                    this.okErrorPage = errorPage;
-                }
                 statusPages.put(Integer.valueOf(errorPage.getErrorCode()),
                                 errorPage);
             }
@@ -3344,12 +3335,7 @@ public class StandardContext extends Con
      */
     @Override
     public ErrorPage findErrorPage(int errorCode) {
-        if (errorCode == 200) {
-            return (okErrorPage);
-        } else {
-            return (statusPages.get(Integer.valueOf(errorCode)));
-        }
-
+        return statusPages.get(Integer.valueOf(errorCode));
     }
 
 
@@ -3979,9 +3965,6 @@ public class StandardContext extends Con
             }
         } else {
             synchronized (statusPages) {
-                if (errorPage.getErrorCode() == 200) {
-                    this.okErrorPage = null;
-                }
                 statusPages.remove(Integer.valueOf(errorPage.getErrorCode()));
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org