Author: markt
Date: Tue Jul 15 08:51:44 2008
New Revision: 676944

URL: http://svn.apache.org/viewvc?rev=676944&view=rev
Log:
As Remy pointed out, this really should be in the finally block.

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

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=676944&r1=676943&r2=676944&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue Jul 15 
08:51:44 2008
@@ -1728,16 +1728,20 @@
                     }
                 } //replacement for Process.waitFor()
     
-                // Close the output stream if used
-                if (cgiOutput != null) {
-                    cgiOutput.close();
-                }
             }
             catch (IOException e){
                 log ("Caught exception " + e);
                 throw e;
             }
             finally{
+                // Close the output stream if used
+                if (cgiOutput != null) {
+                    try {
+                        cgiOutput.close();
+                    } catch (IOException ioe) {
+                        log ("Exception closing output stream " + ioe);
+                    }
+                }
                 if (debug > 4) {
                     log ("Running finally block");
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to