merge with branch issue-138

scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java

@@ -35,6 +35,8 @@ package sonia.scm.web.cgi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.io.ByteStreams;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -210,6 +212,23 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
     return exceptionHandler;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public CGIStatusCodeHandler getStatusCodeHandler()
+  {
+    if (statusCodeHandler == null)
+    {
+      statusCodeHandler = new DefaultCGIStatusCodeHandler();
+    }
+
+    return statusCodeHandler;
+  }
+
   /**
    * Method description
    *
@@ -237,18 +256,6 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
     this.contentLengthWorkaround = contentLengthWorkaround;
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param exceptionHandler
-   */
-  @Override
-  public void setExceptionHandler(CGIExceptionHandler exceptionHandler)
-  {
-    this.exceptionHandler = exceptionHandler;
-  }
-
   //~--- methods --------------------------------------------------------------
 
   /**
@@ -383,21 +390,24 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
   private void execute(Process process) throws IOException
   {
     InputStream processIS = null;
-    InputStream processES = null;
+    ServletOutputStream servletOS = null;
 
     try
     {
-      processES = process.getErrorStream();
-      processErrorStreamAsync(processES);
+      processErrorStreamAsync(process);
       processServletInput(process);
       processIS = process.getInputStream();
-      processProcessInputStream(processIS);
-      waitForFinish(process);
+      servletOS = response.getOutputStream();
+      parseHeaders(processIS);
+
+      long content = ByteStreams.copy(processIS, servletOS);
+
+      waitForFinish(process, servletOS, content);
     }
     finally
     {
       IOUtil.close(processIS);
-      IOUtil.close(processES);
+      IOUtil.close(servletOS);
     }
   }
 
@@ -493,52 +503,35 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
    * Method description
    *
    *
-   * @param errorStream
+   *
+   * @param process
    */
-  private void processErrorStreamAsync(final InputStream errorStream)
+  private void processErrorStreamAsync(final Process process)
   {
     new Thread(new Runnable()
     {
       @Override
       public void run()
       {
+        InputStream errorStream = null;
+
         try
         {
+          errorStream = process.getErrorStream();
           processErrorStream(errorStream);
         }
         catch (IOException ex)
         {
           logger.error("could not read errorstream", ex);
         }
+        finally
+        {
+          IOUtil.close(errorStream);
+        }
       }
     }).start();
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param is
-   *
-   * @throws IOException
-   */
-  private void processProcessInputStream(InputStream is) throws IOException
-  {
-    parseHeaders(is);
-
-    ServletOutputStream servletOS = null;
-
-    try
-    {
-      servletOS = response.getOutputStream();
-      IOUtil.copy(is, servletOS, bufferSize);
-    }
-    finally
-    {
-      IOUtil.close(servletOS);
-    }
-  }
-
   /**
    * Method description
    *
@@ -574,22 +567,47 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
    *
    *
    * @param process
+   * @param output
+   * @param content
    *
+   *
+   * @throws IOException
    */
-  private void waitForFinish(Process process)
+  private void waitForFinish(Process process, ServletOutputStream output,
+                             long content)
+          throws IOException
   {
     try
     {
       int exitCode = process.waitFor();
 
-      if ((exitCode != 0) &&!ignoreExitCode)
+      if (!ignoreExitCode)
       {
-        logger.warn("process ends with exit code {}", exitCode);
+        if (logger.isTraceEnabled())
+        {
+          logger.trace(
+              "handle status code {} with statusCodeHandler, there are {} bytes written to outputstream",
+              exitCode, content);
+        }
+
+        if (content == 0)
+        {
+          getStatusCodeHandler().handleStatusCode(request, response, output,
+                  exitCode);
+        }
+        else
+        {
+          getStatusCodeHandler().handleStatusCode(request, exitCode);
+        }
+      }
+      else if (logger.isDebugEnabled())
+      {
+        logger.debug("ignore status code {}", exitCode);
       }
     }
     catch (InterruptedException ex)
     {
-      logger.error("process interrupted", ex);
+      getExceptionHandler().handleException(request, response, ex);
     }
   }
 
@@ -629,9 +647,6 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
   /** Field description */
   private ServletContext context;
 
-  /** Field description */
-  private CGIExceptionHandler exceptionHandler;
-
   /** Field description */
   private HttpServletRequest request;
 

scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIStatusCodeHandler.java

@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.web.cgi;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class DefaultCGIStatusCodeHandler implements CGIStatusCodeHandler
+{
+
+  /**
+   * the logger for DefaultCGIStatusCodeHandler
+   */
+  private static final Logger logger =
+    LoggerFactory.getLogger(DefaultCGIStatusCodeHandler.class);
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   * @param statusCode
+   */
+  @Override
+  public void handleStatusCode(HttpServletRequest request, int statusCode)
+  {
+    if (statusCode != 0)
+    {
+      logger.warn("process ends with exit code {}", statusCode);
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param request
+   * @param response
+   * @param ouputStream
+   * @param statusCode
+   *
+   * @throws IOException
+   */
+  @Override
+  public void handleStatusCode(HttpServletRequest request,
+                               HttpServletResponse response,
+                               OutputStream ouputStream, int statusCode)
+          throws IOException
+  {
+    handleStatusCode(request, statusCode);
+  }
+}