Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 31294 invoked from network); 3 May 2005 20:38:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2005 20:38:09 -0000 Received: (qmail 90174 invoked by uid 500); 3 May 2005 20:39:07 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 90147 invoked by uid 500); 3 May 2005 20:39:06 -0000 Delivered-To: apmail-jakarta-httpclient-cvs@jakarta.apache.org Received: (qmail 90099 invoked by uid 99); 3 May 2005 20:39:05 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=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; Tue, 03 May 2005 13:39:05 -0700 Received: (qmail 30677 invoked by uid 65534); 3 May 2005 20:37:17 -0000 Message-ID: <20050503203717.30676.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r167986 - /jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/HttpRequestExecutor.java Date: Tue, 03 May 2005 20:37:16 -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: Tue May 3 13:37:16 2005 New Revision: 167986 URL: http://svn.apache.org/viewcvs?rev=3D167986&view=3Drev Log: Made request and response parameters pick up executor's parameters as defau= lts Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/executor/= HttpRequestExecutor.java 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=3D167986&r1=3D1= 67985&r2=3D167986&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 Tue May 3 13:37:16 2005 @@ -70,7 +70,11 @@ throw new IllegalArgumentException("HTTP parameters may not be= null"); } this.params =3D params; - this.localContext =3D new BasicHttpContext(parentContext);=20 + this.localContext =3D new BasicHttpContext(parentContext); + } + =20 + public HttpRequestExecutor(final HttpParams params) { + this(params, null); } =20 private void setInterceptor(final Object obj) { @@ -175,6 +179,9 @@ this.localContext.setAttribute(HttpContext.HTTP_REQUEST, request); this.localContext.setAttribute(HttpContext.HTTP_CONNECTION, conn); this.localContext.setAttribute(HttpContext.HTTP_TARGET_HOST, conn.= getHost()); + + // Link own parameters as defaults=20 + request.getParams().setDefaults(this.params); =20 if (request instanceof HttpMutableRequest) { preprocessRequest((HttpMutableRequest)request); @@ -188,7 +195,7 @@ for (int execCount =3D 0; ; execCount++) { try { if (connparams.isStaleCheckingEnabled()) { - if (conn.isStale()) { + if (conn.isOpen() && conn.isStale()) { conn.close(); } } @@ -220,6 +227,9 @@ throw ex; } } + =20 + // Link own parameters as defaults=20 + response.getParams().setDefaults(this.params); =20 if (response instanceof HttpMutableResponse) { postprocessResponse((HttpMutableResponse)response);