Merge pull request #239 from tencentyun/dev/error_code_retry

Dev/error code retry

Author: Dzkol

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.244.2</version>
+    <version>5.6.244.3</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

src/main/java/com/qcloud/cos/COSClient.java

@@ -1183,7 +1183,7 @@ public COSObject getObject(GetObjectRequest getObjectRequest)
              * to wrap their code in try/catch blocks and check for this status code if they want to
              * use constraints.
              */
-            if (cse.getStatusCode() == 412 || cse.getStatusCode() == 304) {
+            if ((cse.getStatusCode() == 412 && !clientConfig.isThrow412Directly()) || (cse.getStatusCode() == 304 && !clientConfig.isThrow304Directly())) {
                 return null;
             }
             throw cse;

src/main/java/com/qcloud/cos/ClientConfig.java

@@ -141,6 +141,10 @@ public class ClientConfig {
 
     private boolean addLogDebugHeader = true;
 
+    private boolean throw412Directly = false;
+
+    private boolean throw304Directly = false;
+
     // 不传入region 用于后续调用List Buckets(获取所有的bucket信息)
     public ClientConfig() {
         super();
@@ -517,4 +521,20 @@ public boolean isAddLogDebugHeader() {
     public void setAddLogDebugHeader(boolean addLogDebugHeader) {
         this.addLogDebugHeader = addLogDebugHeader;
     }
+
+    public boolean isThrow412Directly() {
+        return throw412Directly;
+    }
+
+    public void setThrow412Directly(boolean throw412Directly) {
+        this.throw412Directly = throw412Directly;
+    }
+
+    public boolean isThrow304Directly() {
+        return throw304Directly;
+    }
+
+    public void setThrow304Directly(boolean throw304Directly) {
+        this.throw304Directly = throw304Directly;
+    }
 }

src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java

@@ -832,7 +832,7 @@ private <Y extends CosServiceRequest> void changeEndpointForRetry(CosHttpRequest
             for (Header header : httpResponse.getAllHeaders()) {
                 if (Objects.equals(header.getName(), Headers.REQUEST_ID)) {
                     String value = CodecUtils.convertFromIso88591ToUtf8(header.getValue());
-                    if (!value.isEmpty()) {
+                    if (value != null && !value.isEmpty()) {
                         return;
                     }
                 }