You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/04/12 23:13:39 UTC

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

Author: markt
Date: Sat Apr 12 21:13:38 2014
New Revision: 1586901

URL: http://svn.apache.org/r1586901
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56405
Restore directory listings

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=1586901&r1=1586900&r2=1586901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sat Apr 12 21:13:38 2014
@@ -934,11 +934,11 @@ public class DefaultServlet extends Http
                                 ostream.write(resourceBody);
                             }
                         }
-                        // If a stream was configured, it needs to be copied to
-                        // the output (this method closes the stream)
-                        if (renderResult != null) {
-                            copy(resource, renderResult, ostream);
-                        }
+                    }
+                    // If a stream was configured, it needs to be copied to
+                    // the output (this method closes the stream)
+                    if (renderResult != null) {
+                        copy(resource, renderResult, ostream);
                     }
                 }
             }



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