svn commit: r1793502 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

[markt]

Author: markt
Date: Tue May  2 14:33:46 2017
New Revision: 1793502

URL: http://svn.apache.org/viewvc?rev=1793502&view=rev
Log:
Refactor 

Modified:
    tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1793502&r1=1793501&r2=1793502&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue May  
2 14:33:46 2017
@@ -747,6 +747,7 @@ public class DefaultServlet extends Http
         }
 
         WebResource resource = resources.getResource(path);
+        boolean isError = DispatcherType.ERROR == request.getDispatcherType();
 
         if (!resource.exists()) {
             // Check if we're included so we can return the appropriate
@@ -762,7 +763,7 @@ public class DefaultServlet extends Http
                         "defaultServlet.missingResource", requestUri));
             }
 
-            if (DispatcherType.ERROR == request.getDispatcherType()) {
+            if (isError) {
                 response.sendError(((Integer) request.getAttribute(
                         RequestDispatcher.ERROR_STATUS_CODE)).intValue());
             } else {
@@ -786,7 +787,7 @@ public class DefaultServlet extends Http
                         "defaultServlet.missingResource", requestUri));
             }
 
-            if (DispatcherType.ERROR == request.getDispatcherType()) {
+            if (isError) {
                 response.sendError(((Integer) request.getAttribute(
                         RequestDispatcher.ERROR_STATUS_CODE)).intValue());
             } else {
@@ -809,8 +810,6 @@ public class DefaultServlet extends Http
             return;
         }
 
-        boolean isError = DispatcherType.ERROR == request.getDispatcherType();
-
         boolean included = false;
         // Check if the conditions specified in the optional If headers are
         // satisfied.



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