Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned exception handling

This commit is contained in:
Adrian Cole 2011-04-20 17:37:02 -07:00
parent d0a5278ca0
commit cfb180f638
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
View File

@ -25,7 +25,6 @@ import static com.google.common.collect.Iterables.getLast;
import static com.google.common.io.ByteStreams.toByteArray;
import static com.google.common.io.Closeables.closeQuietly;
import static org.jclouds.io.Payloads.newInputStreamPayload;
import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -107,15 +106,12 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
InputStream in = null;
try {
in = consumeOnClose(connection.getInputStream());
} catch (Exception e) {
IOException ioe = getFirstThrowableOfType(e, IOException.class);
if (ioe != null) {
in = bufferAndCloseStream(connection.getErrorStream());
} else {
closeQuietly(in);
propagate(e);
assert false : "should have propagated exception";
}
} catch (IOException e) {
in = bufferAndCloseStream(connection.getErrorStream());
} catch (RuntimeException e) {
closeQuietly(in);
propagate(e);
assert false : "should have propagated exception";
}
int responseCode = connection.getResponseCode();