Better code for handling of non-repeatable requests

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@664326 13f79535-47bb-0310-9956-ffa450edef68

module-client/src/main/java/org/apache/http/client/NonRepeatableRequestException.java

@@ -1,7 +1,7 @@
 /*
- * $HeadURL:$
+ * $HeadURL$
- * $Revision:$
+ * $Revision$
- * $Date:$
+ * $Date$
  *
  * ====================================================================
  *
@@ -40,14 +40,14 @@
  * 
  * @since 4.0
  */
-public class NonRepeatableEntityException extends ProtocolException {
+public class NonRepeatableRequestException extends ProtocolException {
 
     private static final long serialVersionUID = 82685265288806048L;
 
     /**
      * Creates a new NonRepeatableEntityException with a <tt>null</tt> detail message. 
      */
-    public NonRepeatableEntityException() {
+    public NonRepeatableRequestException() {
         super();
     }
 
@@ -56,7 +56,7 @@ public NonRepeatableEntityException() {
      * 
      * @param message The exception detail message
      */
-    public NonRepeatableEntityException(String message) {
+    public NonRepeatableRequestException(String message) {
         super(message);
     }
 

module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java

@@ -61,7 +61,7 @@
 import org.apache.http.client.ClientRequestDirector;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.NonRepeatableEntityException;
+import org.apache.http.client.NonRepeatableRequestException;
 import org.apache.http.client.RedirectException;
 import org.apache.http.client.RedirectHandler;
 import org.apache.http.client.UserTokenHandler;
@@ -384,17 +384,13 @@ public HttpResponse execute(HttpHost target, HttpRequest request,
 
                 boolean retrying = true;
                 while (retrying) {
+                    // Increment total exec count (with redirects)
                     execCount++;
-                    
+                    // Increment exec count for this particular request
-                    if (execCount > 1) {
+                    wrapper.incrementExecCount();
-                        if (request instanceof HttpEntityEnclosingRequest) {
+                    if (wrapper.getExecCount() > 1 && !wrapper.isRepeatable()) {
-                            HttpEntity entity = 
+                        throw new NonRepeatableRequestException("Cannot retry request " +
-                                ((HttpEntityEnclosingRequest) request).getEntity();
+                                "with a non-repeatable request entity");
-                            if (entity != null && !entity.isRepeatable()) {
-                                throw new NonRepeatableEntityException(
-                                        "Cannot retry the request");
-                            }
-                        }
                     }
                     
                     try {

module-client/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java

@@ -75,4 +75,9 @@ public boolean expectContinue() {
         return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());
     }
 
+    @Override
+    public boolean isRepeatable() {
+        return this.entity == null || this.entity.isRepeatable();
+    }
+    
 }

module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java

@@ -64,6 +64,7 @@ class RequestWrapper extends AbstractHttpMessage implements HttpUriRequest {
     private URI uri;
     private String method;
     private ProtocolVersion version;
+    private int execCount;
     
     public RequestWrapper(final HttpRequest request) throws ProtocolException {
         super();
@@ -88,6 +89,13 @@ public RequestWrapper(final HttpRequest request) throws ProtocolException {
             this.method = requestLine.getMethod();
             this.version = request.getProtocolVersion();
         }
+        this.execCount = 0;
+    }
+
+    public void resetHeaders() {
+        // Make a copy of original headers
+        this.headergroup.clear();
+        setHeaders(this.original.getAllHeaders());
     }
     
     public String getMethod() {
@@ -147,10 +155,16 @@ public HttpRequest getOriginal() {
         return this.original;
     }
     
-    public void resetHeaders() {
+    public boolean isRepeatable() {
-        // Make a copy of original headers
+        return true;
-        this.headergroup.clear();
+    }
-        setHeaders(this.original.getAllHeaders());
+
+    public int getExecCount() {
+        return this.execCount;
+    }
+    
+    public void incrementExecCount() {
+        this.execCount++;
     }
     
 }

module-client/src/test/java/org/apache/http/impl/client/TestDefaultClientRequestDirector.java

@@ -50,7 +50,7 @@
 import org.apache.http.HttpStatus;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.NonRepeatableEntityException;
+import org.apache.http.client.NonRepeatableRequestException;
 import org.apache.http.client.methods.AbortableHttpRequest;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -727,7 +727,7 @@ public void testNonRepatableEntity() throws Exception {
         try {
             client.execute(getServerHttp(), httppost, context);
             fail("NonRepeatableEntityException should have been thrown");
-        } catch (NonRepeatableEntityException ex) {
+        } catch (NonRepeatableRequestException ex) {
            // expected
         }
     }