motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Check connection's error stream before reading from it"

This commit is contained in:
Christian Halstrick 2012-03-06 09:26:38 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 8b1eee47d2 2c6187697c
commit e05300b21d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java
View File

@ -512,10 +512,14 @@ private IOException error(final String action, final String key,
final HttpURLConnection c) throws IOException {
final IOException err = new IOException(MessageFormat.format(JGitText.get().amazonS3ActionFailed
, action, key, HttpSupport.response(c), c.getResponseMessage()));
final InputStream errorStream = c.getErrorStream();
if (errorStream == null)
return err;
final ByteArrayOutputStream b = new ByteArrayOutputStream();
byte[] buf = new byte[2048];
for (;;) {
final int n = c.getErrorStream().read(buf);
final int n = errorStream.read(buf);
if (n < 0)
break;
if (n > 0)