Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

added getContent method to IOUtil

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-30 08:30:14 +02:00
parent 219af68563
commit a092d6b79f
2 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scm-core/src/main/java/sonia/scm/util/IOUtil.java
View File

@@ -45,12 +45,14 @@ import sonia.scm.io.ZipUnArchiver;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.BufferedReader;
import java.io.Closeable; import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.Reader; import java.io.Reader;
import java.io.Writer; import java.io.Writer;
@@ -592,6 +594,48 @@ public class IOUtil
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param in
*
* @return
* @since 1.8
*
* @throws IOException
*/
public static String getContent(InputStream in) throws IOException
{
StringBuilder content = new StringBuilder();
BufferedReader reader = null;
try
{
reader = new BufferedReader(new InputStreamReader(in));
String s = System.getProperty("line.separator");
String line = reader.readLine();
while (line != null)
{
content.append(line);
line = reader.readLine();
if (line != null)
{
content.append(s);
}
}
}
finally
{
close(reader);
}
return content.toString();
}
/** /**
* Method description * Method description
* *

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

@@ -396,40 +396,14 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
*/ */
private void processErrorStream(InputStream in) throws IOException private void processErrorStream(InputStream in) throws IOException
{ {
BufferedReader reader = null; if (logger.isWarnEnabled())
try
{ {
reader = new BufferedReader(new InputStreamReader(in)); String error = IOUtil.getContent(in);
StringBuilder error = new StringBuilder(); if (Util.isNotEmpty(error))
String s = System.getProperty("line.separator");
String line = reader.readLine();
while (line != null)
{ {
error.append(line); logger.warn(error.trim());
line = reader.readLine();
if (line != null)
{
error.append(s);
}
} }
if (logger.isWarnEnabled())
{
String msg = error.toString().trim();
if (Util.isNotEmpty(msg))
{
logger.warn(msg);
}
}
}
finally
{
IOUtil.close(reader);
} }
} }