Merge pull request #495 from qiniu/update_exception

bachue · web-flow · commit 9bc7deb62ba9 · 2020-09-10T13:51:45.000+08:00
update qiniu exception
diff --git a/src/main/java/com/qiniu/common/QiniuException.java b/src/main/java/com/qiniu/common/QiniuException.java
@@ -26,17 +26,17 @@ public QiniuException(Exception e) {
     }
 
     public QiniuException(Exception e, String msg) {
-        super(msg, e);
+        super(msg != null ? msg : (e != null ? e.getMessage() : null), e);
         this.response = null;
         this.error = msg;
     }
 
     public String url() {
-        return response.url();
+        return response != null ? response.url() : "";
     }
 
     public int code() {
-        return response == null ? -1 : response.statusCode;
+        return response != null ? response.statusCode : -1;
     }
 
     public String error() {

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,17 @@ public QiniuException(Exception e) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public QiniuException(Exception e, String msg) {`
`29`		`- super(msg, e);`
	`29`	`+ super(msg != null ? msg : (e != null ? e.getMessage() : null), e);`
`30`	`30`	`this.response = null;`
`31`	`31`	`this.error = msg;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public String url() {`
`35`		`- return response.url();`
	`35`	`+ return response != null ? response.url() : "";`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public int code() {`
`39`		`- return response == null ? -1 : response.statusCode;`
	`39`	`+ return response != null ? response.statusCode : -1;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public String error() {`