Fix the bug that when InputStream throws IOException, DbxUploader#uploadAndFinish() throws NetworkIOException

zjiuyang · zjiuyang · commit 730598913ef1 · 2017-01-29T22:15:45.000-08:00
diff --git a/src/main/java/com/dropbox/core/DbxUploader.java b/src/main/java/com/dropbox/core/DbxUploader.java
@@ -93,6 +93,8 @@ public R uploadAndFinish(InputStream in) throws X, DbxException, IOException {
         try {
             try {
                 httpUploader.upload(in);
+            } catch (IOUtil.ReadException ex) {
+                throw ex.getCause();
             } catch (IOException ex) {
                 // write exceptions and everything else is a Network I/O problem
                 throw new NetworkIOException(ex);
diff --git a/src/main/java/com/dropbox/core/http/HttpRequestor.java b/src/main/java/com/dropbox/core/http/HttpRequestor.java
@@ -79,7 +79,13 @@ public static abstract class Uploader {
         public abstract Response finish() throws IOException;
 
         public void upload(File file) throws IOException {
-            upload(new FileInputStream(file));
+            try {
+                upload(new FileInputStream(file));
+            } catch (IOUtil.ReadException ex) {
+                throw ex.getCause();
+            } catch (IOUtil.WriteException ex) {
+                throw ex.getCause();
+            }
         }
 
         public void upload(InputStream in, long limit) throws IOException {
@@ -90,8 +96,6 @@ public void upload(InputStream in) throws IOException {
             OutputStream out = getBody();
             try {
                 IOUtil.copyStreamToStream(in, out);
-            } catch (IOUtil.ReadException ex) {
-                throw ex.getCause();
             } finally {
                 out.close();
             }
