Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 06:55:47 +01:00
Code Issues Packages Projects Releases Activity

pass outputstream to status code handler to improve mercurial error handling

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-05-08 22:10:34 +02:00
parent 5ededccd10
commit e85ff1317c
4 changed files with 125 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
@@ -389,6 +391,7 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
{
InputStream processIS = null;
InputStream processES = null;
ServletOutputStream servletOS = null;
try
{
@@ -396,13 +399,18 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
processErrorStreamAsync(processES);
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);
}
}
@@ -519,31 +527,6 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
}).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
*
@@ -579,9 +562,15 @@ 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
{
@@ -591,11 +580,20 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
{
if (logger.isTraceEnabled())
{
logger.trace("handle status code {} with statusCodeHandler",
exitCode);
logger.trace(
"handle status code {} with statusCodeHandler, there are {} bytes written to outputstream",
exitCode, content);
}
getStatusCodeHandler().handleStatusCode(request, response, exitCode);
if (content == 0)
{
getStatusCodeHandler().handleStatusCode(request, response, output,
exitCode);
}
else
{
getStatusCodeHandler().handleStatusCode(request, exitCode);
}
}
else if (logger.isDebugEnabled())
{