Return-Path: 
 <httpclient-commits-return-97-apmail-jakarta-httpclient-commits-archive=www.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org
Received: (qmail 18692 invoked from network); 7 Apr 2005 20:58:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Apr 2005 20:58:41 -0000
Received: (qmail 14842 invoked by uid 500); 7 Apr 2005 20:58: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 14813 invoked by uid 500); 7 Apr 2005 20:58:39 -0000
Delivered-To: apmail-jakarta-httpclient-cvs@jakarta.apache.org
Received: (qmail 14798 invoked by uid 99); 7 Apr 2005 20:58:39 -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, 07 Apr 2005 13:58:38 -0700
Received: (qmail 18661 invoked by uid 65534); 7 Apr 2005 20:58:37 -0000
Message-ID: <20050407205837.18660.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 07 Apr 2005 20:58:37 -0000
Subject: svn commit: r160469 - in
 jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl:
 AbstractHttpConnection.java NIOProtocolSocketFactory.java
To: httpclient-cvs@jakarta.apache.org
From: olegk@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: olegk
Date: Thu Apr  7 13:58:36 2005
New Revision: 160469

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D160469
Log:
Minor bug fixes

Modified:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Abst=
ractHttpConnection.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOP=
rotocolSocketFactory.java

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/imp=
l/AbstractHttpConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/AbstractHttpConnection.java?view=3Ddiff&r1=3D160=
468&r2=3D160469
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/impl/Abst=
ractHttpConnection.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Abst=
ractHttpConnection.java Thu Apr  7 13:58:36 2005
@@ -77,6 +77,7 @@
             throw new IllegalArgumentException("HTTP parameters may not be=
 null");
         }
         assertNotOpen();
+        this.socket =3D socket;
         HttpConnectionParams connParams =3D new HttpConnectionParams(param=
s);=20
         this.socket.setTcpNoDelay(connParams.getTcpNoDelay());
         this.socket.setSoTimeout(connParams.getSoTimeout());

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/imp=
l/NIOProtocolSocketFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/NIOProtocolSocketFactory.java?view=3Ddiff&r1=3D1=
60468&r2=3D160469
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/impl/NIOP=
rotocolSocketFactory.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOP=
rotocolSocketFactory.java Thu Apr  7 13:58:36 2005
@@ -34,6 +34,7 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.nio.channels.SocketChannel;
=20
 import org.apache.http.ConnectTimeoutException;
 import org.apache.http.ProtocolSocketFactory;
@@ -99,7 +100,8 @@
         if (params =3D=3D null) {
             throw new IllegalArgumentException("Parameters may not be null=
");
         }
-        Socket socket =3D new Socket();
+        SocketChannel channel =3D SocketChannel.open();=20
+        Socket socket =3D channel.socket();
         if (localAddress !=3D null) {
             socket.bind(new InetSocketAddress(localAddress, localPort));
         }