merge

Author: sxci

src/main/java/com/qiniu/storage/ResumeUploader.java

@@ -68,6 +68,14 @@ public final class ResumeUploader {
     }
 
     public Response upload() throws QiniuException {
+        try {
+            return upload0();
+        } finally {
+            close();
+        }
+    }
+
+    private Response upload0() throws QiniuException {
         if (host == null) {
             this.host = configuration.upHost(upToken);
         }

src/main/java/com/qiniu/storage/StreamUploader.java

@@ -46,6 +46,14 @@ public final class StreamUploader {
     }
 
     public Response upload() throws QiniuException {
+        try {
+            return upload0();
+        } finally {
+            close();
+        }
+    }
+
+    private Response upload0() throws QiniuException {
         if (host == null) {
             this.host = configuration.upHost(upToken);
         }

src/test/java/com/qiniu/storage/ResumeUploadTest.java

@@ -40,7 +40,7 @@ public void testXVar() throws IOException {
             StringMap m = res.jsonToMap();
             assertEquals("foo_val", m.get("foo"));
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         } finally {
             TempFile.remove(f);
@@ -69,7 +69,7 @@ private void template(int size, boolean https) throws IOException {
             assertEquals(String.valueOf(f.length()), ret.fsize);
             assertEquals(etag, ret.hash);
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         }
         TempFile.remove(f);

src/test/java/com/qiniu/storage/StreamUploadTest.java

@@ -44,7 +44,7 @@ public void testXVar() throws IOException {
             StringMap m = res.jsonToMap();
             assertEquals("foo_val", m.get("foo"));
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         } finally {
             TempFile.remove(f);
@@ -74,7 +74,7 @@ private void template(int size, boolean https) throws IOException {
             assertEquals(mime, ret.mimeType);
             assertEquals(etag, ret.hash);
         } catch (QiniuException e) {
-            assertEquals("", e.response.bodyString());
+            assertEquals("", e.response == null ? "e.response is null" : e.response.bodyString());
             fail();
         }
         TempFile.remove(f);