Return-Path: 
 <httpclient-commits-return-140-apmail-jakarta-httpclient-commits-archive=www.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org
Received: (qmail 52960 invoked from network); 9 Jun 2005 19:46:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 9 Jun 2005 19:46:40 -0000
Received: (qmail 26902 invoked by uid 500); 9 Jun 2005 19:46:39 -0000
Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:httpclient-commits-help@jakarta.apache.org>
List-Unsubscribe: <mailto:httpclient-commits-unsubscribe@jakarta.apache.org>
List-Post: <mailto:httpclient-commits@jakarta.apache.org>
List-Id: <httpclient-commits.jakarta.apache.org>
Reply-To: httpclient-dev@jakarta.apache.org
Delivered-To: mailing list httpclient-commits@jakarta.apache.org
Received: (qmail 26889 invoked by uid 500); 9 Jun 2005 19:46:39 -0000
Delivered-To: apmail-jakarta-httpclient-cvs@jakarta.apache.org
Received: (qmail 26886 invoked by uid 99); 9 Jun 2005 19:46:38 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 09 Jun 2005 12:46:37 -0700
Received: (qmail 52652 invoked by uid 65534); 9 Jun 2005 19:45:25 -0000
Message-ID: <20050609194525.52650.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r189802 - in /jakarta/httpclient/trunk/http-common/src:
 contrib/org/apache/http/contrib/spring/http-beans.xml
 java/org/apache/http/executor/HttpExecutionContext.java
 java/org/apache/http/executor/HttpRequestExecutor.java
 java/org/apache/http/impl/DefaultHttpRequestRetryHandler.java
Date: Thu, 09 Jun 2005 19:45:24 -0000
To: httpclient-cvs@jakarta.apache.org
From: olegk@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: olegk
Date: Thu Jun  9 12:45:22 2005
New Revision: 189802

URL: http://svn.apache.org/viewcvs?rev=3D189802&view=3Drev
Log:
Added default request retry handler

Added:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpRequestRetryHandler.java
      - copied, changed from r189566, jakarta/commons/proper/httpclient/tru=
nk/src/java/org/apache/commons/httpclient/DefaultHttpMethodRetryHandler.java
Modified:
    jakarta/httpclient/trunk/http-common/src/contrib/org/apache/http/contri=
b/spring/http-beans.xml
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpExecutionContext.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpRequestExecutor.java

Modified: jakarta/httpclient/trunk/http-common/src/contrib/org/apache/http/=
contrib/spring/http-beans.xml
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/contrib/org/apache/http/contrib/spring/http-beans.xml?rev=3D189802&r1=3D18=
9801&r2=3D189802&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/contrib/org/apache/http/contri=
b/spring/http-beans.xml (original)
+++ jakarta/httpclient/trunk/http-common/src/contrib/org/apache/http/contri=
b/spring/http-beans.xml Thu Jun  9 12:45:22 2005
@@ -24,6 +24,12 @@
     <constructor-arg index=3D"2"><value>80</value></constructor-arg>
   </bean>
  =20
+  <bean id=3D"request-retry-handler"=20
+    class=3D"org.apache.http.impl.DefaultHttpRequestRetryHandler">
+    <constructor-arg index=3D"0"><value>3</value></constructor-arg>
+    <constructor-arg index=3D"1"><value>false</value></constructor-arg>
+  </bean>
+ =20
   <bean id=3D"http-executor"=20
     class=3D"org.apache.http.executor.HttpRequestExecutor"=20
     singleton=3D"true" >
@@ -38,6 +44,7 @@
         <bean class=3D"org.apache.http.interceptor.RequestExpectContinue" =
/>
       </set>
     </property>
+    <property name=3D"retryHandler"><ref bean=3D"request-retry-handler"/><=
/property>
   </bean>
  =20
   <bean id=3D"http-data-trx-factory"=20

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/exe=
cutor/HttpExecutionContext.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/executor/HttpExecutionContext.java?rev=3D189802&r1=3D=
189801&r2=3D189802&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpExecutionContext.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpExecutionContext.java Thu Jun  9 12:45:22 2005
@@ -49,6 +49,7 @@
     public static final String HTTP_CONNECTION  =3D "http.connection";=20
     public static final String HTTP_TARGET_HOST =3D "http.target_host";=20
     public static final String HTTP_PROXY_HOST  =3D "http.proxy_host";=20
+    public static final String HTTP_REQ_SENT    =3D "http.request_sent";=20
    =20
     private final HttpContext parentContext;
     private Map map =3D null;

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/exe=
cutor/HttpRequestExecutor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/executor/HttpRequestExecutor.java?rev=3D189802&r1=3D1=
89801&r2=3D189802&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpRequestExecutor.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/=
HttpRequestExecutor.java Thu Jun  9 12:45:22 2005
@@ -219,7 +219,11 @@
                     conn.open(this.params);
                     // TODO: Implement secure tunnelling
                 }
+                this.localContext.setAttribute(HttpExecutionContext.HTTP_R=
EQ_SENT,=20
+                        new Boolean(false));=20
                 response =3D conn.sendRequest(request);
+                this.localContext.setAttribute(HttpExecutionContext.HTTP_R=
EQ_SENT,=20
+                        new Boolean(true));=20
                 // Request may be terminated prematurely, if the expect-co=
ntinue=20
                 // protocol is used
                 if (response =3D=3D null) {

Copied: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/=
DefaultHttpRequestRetryHandler.java (from r189566, jakarta/commons/proper/h=
ttpclient/trunk/src/java/org/apache/commons/httpclient/DefaultHttpMethodRet=
ryHandler.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/DefaultHttpRequestRetryHandler.java?p2=3Djakarta=
/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpRequ=
estRetryHandler.java&p1=3Djakarta/commons/proper/httpclient/trunk/src/java/=
org/apache/commons/httpclient/DefaultHttpMethodRetryHandler.java&r1=3D18956=
6&r2=3D189802&rev=3D189802&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/htt=
pclient/DefaultHttpMethodRetryHandler.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpRequestRetryHandler.java Thu Jun  9 12:45:22 2005
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jak=
arta-commons//httpclient/src/java/org/apache/commons/httpclient/DefaultHttp=
MethodRetryHandler.java,v 1.3 2004/12/20 11:47:46 olegk Exp $
+ * $HeadURL$
  * $Revision$
  * $Date$
  *
@@ -27,29 +27,27 @@
  *
  */
=20
-package org.apache.commons.httpclient;
+package org.apache.http.impl;
=20
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.UnknownHostException;
=20
+import javax.net.ssl.SSLHandshakeException;
+
+import org.apache.http.HttpContext;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.executor.HttpExecutionContext;
+import org.apache.http.executor.HttpRequestRetryHandler;
+
 /**
- * The default {@link HttpMethodRetryHandler} used by {@link HttpMethod}s.
+ * The default {@link HttpRequestRetryHandler} used by {@link HttpRequestE=
xecutor}s.
  *=20
  * @author Michael Becke
- * @author <a href=3D"mailto:oleg -at- ural.ru">Oleg Kalnichevski</a>
+ * @author <a href=3D"mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  */
-public class DefaultHttpMethodRetryHandler implements HttpMethodRetryHandl=
er {
-
+public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHan=
dler {
=20
-	private static Class SSL_HANDSHAKE_EXCEPTION =3D null;
-=09
-	static {
-		try {
-			SSL_HANDSHAKE_EXCEPTION =3D Class.forName("javax.net.ssl.SSLHandshakeEx=
ception");
-		} catch (ClassNotFoundException ignore) {		=09
-		}
-	}
 	/** the number of times a method will be retried */
     private int retryCount;
    =20
@@ -59,7 +57,7 @@
     /**
      * Default constructor
      */
-    public DefaultHttpMethodRetryHandler(int retryCount, boolean requestSe=
ntRetryEnabled) {
+    public DefaultHttpRequestRetryHandler(int retryCount, boolean requestS=
entRetryEnabled) {
         super();
         this.retryCount =3D retryCount;
         this.requestSentRetryEnabled =3D requestSentRetryEnabled;
@@ -68,7 +66,7 @@
     /**
      * Default constructor
      */
-    public DefaultHttpMethodRetryHandler() {
+    public DefaultHttpRequestRetryHandler() {
         this(3, false);
     }
     /**=20
@@ -77,16 +75,16 @@
      *=20
      * @see HttpMethodRetryHandler#retryMethod(HttpMethod, IOException, in=
t)
      */
-    public boolean retryMethod(
-        final HttpMethod method,=20
-        final IOException exception,=20
-        int executionCount) {
-        if (method =3D=3D null) {
-            throw new IllegalArgumentException("HTTP method may not be nul=
l");
-        }
+    public boolean retryRequest(
+            final IOException exception,=20
+            int executionCount,
+            final HttpContext context) {
         if (exception =3D=3D null) {
             throw new IllegalArgumentException("Exception parameter may no=
t be null");
         }
+        if (context =3D=3D null) {
+            throw new IllegalArgumentException("HTTP context may not be nu=
ll");
+        }
         if (executionCount > this.retryCount) {
             // Do not retry if over max retry count
             return false;
@@ -103,11 +101,13 @@
             // Unknown host
             return false;
         }
-        if (SSL_HANDSHAKE_EXCEPTION !=3D null && SSL_HANDSHAKE_EXCEPTION.i=
sInstance(exception)) {
+        if (exception instanceof SSLHandshakeException) {
             // SSL handshake exception
             return false;
         }
-        if (!method.isRequestSent() || this.requestSentRetryEnabled) {
+        Boolean b =3D (Boolean) context.getAttribute(HttpExecutionContext.=
HTTP_REQ_SENT);
+        boolean sent =3D (b !=3D null && b.booleanValue());
+        if (!sent || this.requestSentRetryEnabled) {
             // Retry if the request has not been sent fully or
             // if it's OK to retry methods that have been sent
             return true;