调整

sxci · sxci · commit 1d2f5a07dcde · 2014-04-24T10:38:56.000+08:00
diff --git a/src/main/java/com/qiniu/api/resumableio/ChunkUploadCallRet.java b/src/main/java/com/qiniu/api/resumableio/ChunkUploadCallRet.java
@@ -27,17 +27,19 @@ public ChunkUploadCallRet(int statusCode, Exception e) {
 	}
 	
 	private void doUnmarshal() {
+		if (this.exception != null || this.response == null
+				|| !this.response.trim().startsWith("{")) {
+			return;
+		}
 		try {
-			if(this.exception != null || this.response != null && this.response.trim().startsWith("{")){
-				unmarshal();
-			}
+			unmarshal();
 		} catch (Exception e) {
 			e.printStackTrace();
-			if(this.exception == null){
+			if (this.exception == null) {
 				this.exception = e;
 			}
 		}
-		
+
 	}
 
 	protected void unmarshal() throws JSONException{

Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,19 @@ public ChunkUploadCallRet(int statusCode, Exception e) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private void doUnmarshal() {`
	`30`	`+ if (this.exception != null \|\| this.response == null`
	`31`	`+ \|\| !this.response.trim().startsWith("{")) {`
	`32`	`+ return;`
	`33`	`+ }`
`30`	`34`	`try {`
`31`		`- if(this.exception != null \|\| this.response != null && this.response.trim().startsWith("{")){`
`32`		`- unmarshal();`
`33`		`- }`
	`35`	`+ unmarshal();`
`34`	`36`	`} catch (Exception e) {`
`35`	`37`	`e.printStackTrace();`
`36`		`- if(this.exception == null){`
	`38`	`+ if (this.exception == null) {`
`37`	`39`	`this.exception = e;`
`38`	`40`	`}`
`39`	`41`	`}`
`40`		`-`
	`42`	`+`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`protected void unmarshal() throws JSONException{`