Index: DefaultMethodRetryHandler.java
===================================================================
RCS file: DefaultMethodRetryHandler.java
diff -N DefaultMethodRetryHandler.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ DefaultMethodRetryHandler.java 30 Apr 2003 23:58:11 -0000
@@ -0,0 +1,133 @@
+/*
+ * $Header: $
+ * $Revision: $
+ * $Date: $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ * [Additional notices, if required by prior licensing conditions]
+ *
+ */
+
+package org.apache.commons.httpclient;
+
+/**
+ * The default MethodRetryHandler used by HttpMethodBase.
+ *
+ * @author Michael Becke
+ *
+ * @see HttpMethodBase#setMethodRetryHandler(MethodRetryHandler)
+ */
+public class DefaultMethodRetryHandler implements MethodRetryHandler {
+
+ /** the number of times a method will be retried */
+ private int retryCount;
+
+ /** Whether or not methods that have successfully sent their request will be retried */
+ private boolean requestSentRetryEnabled;
+
+ /**
+ */
+ public DefaultMethodRetryHandler() {
+ this.retryCount = 3;
+ this.requestSentRetryEnabled = false;
+ }
+
+ /**
+ * Used retryCount and requestSentRetryEnabled to determine
+ * if the given method should be retried.
+ *
+ * @see MethodRetryHandler#retryMethod(HttpMethod, HttpConnection, HttpRecoverableException, int, boolean)
+ */
+ public boolean retryMethod(
+ HttpMethod method,
+ HttpConnection connection,
+ HttpRecoverableException recoverableException,
+ int executionCount,
+ boolean requestSent
+ ) {
+ return ((!requestSent || requestSentRetryEnabled) && (executionCount <= retryCount));
+ }
+ /**
+ * @return true if this handler will retry methods that have
+ * successfully sent their request, false otherwise
+ */
+ public boolean isRequestSentRetryEnabled() {
+ return requestSentRetryEnabled;
+ }
+
+ /**
+ * @return the maximum number of times a method will be retried
+ */
+ public int getRetryCount() {
+ return retryCount;
+ }
+
+ /**
+ * @param requestSentRetryEnabled a flag indicating if methods that have
+ * successfully sent their request should be retried
+ */
+ public void setRequestSentRetryEnabled(boolean requestSentRetryEnabled) {
+ this.requestSentRetryEnabled = requestSentRetryEnabled;
+ }
+
+ /**
+ * @param retryCount the maximum number of times a method can be retried
+ */
+ public void setRetryCount(int retryCount) {
+ this.retryCount = retryCount;
+ }
+
+}
\ No newline at end of file
Index: HttpMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v
retrieving revision 1.141
diff -u -r1.141 HttpMethodBase.java
--- HttpMethodBase.java 28 Apr 2003 23:19:56 -0000 1.141
+++ HttpMethodBase.java 30 Apr 2003 23:58:17 -0000
@@ -139,8 +139,6 @@
*/
public abstract class HttpMethodBase implements HttpMethod {
- // ------------------------------------------ Static variables/initializers
-
/** Maximum number of redirects and authentications that will be followed */
private static final int MAX_FORWARDS = 100;
@@ -2507,7 +2505,13 @@
recoverableExceptionCount++;
// test if this method should be retried
- if (!getMethodRetryHandler().retryMethod(this, httpre, execCount, requestSent)) {
+ if (!getMethodRetryHandler().retryMethod(
+ this,
+ connection,
+ httpre,
+ execCount,
+ requestSent)
+ ) {
LOG.warn(
"Recoverable exception caught but MethodRetryHandler.retryMethod() "
+ "returned false, rethrowing exception"
@@ -2640,18 +2644,7 @@
public MethodRetryHandler getMethodRetryHandler() {
if (methodRetryHandler == null) {
- // a retry handler that will retry 3 times as long as the request has
- // not been sent
- methodRetryHandler = new MethodRetryHandler() {
- public boolean retryMethod(
- HttpMethod method,
- HttpRecoverableException recoverableException,
- int executionCount,
- boolean requestSent
- ) {
- return (!requestSent && (executionCount <= 3));
- }
- };
+ methodRetryHandler = new DefaultMethodRetryHandler();
}
return methodRetryHandler;
Index: MethodRetryHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/MethodRetryHandler.java,v
retrieving revision 1.1
diff -u -r1.1 MethodRetryHandler.java
--- MethodRetryHandler.java 18 Apr 2003 12:53:27 -0000 1.1
+++ MethodRetryHandler.java 30 Apr 2003 23:58:17 -0000
@@ -79,6 +79,7 @@
* occurs during execution.
*
* @param method the method being executed
+ * @param connection the connection the method is using
* @param recoverableException the exception that occurred
* @param executionCount the number of times this method has been
* unsuccessfully executed
@@ -89,6 +90,7 @@
*/
boolean retryMethod(
HttpMethod method,
+ HttpConnection connection,
HttpRecoverableException recoverableException,
int executionCount,
boolean requestSent);