You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2005/10/16 00:19:03 UTC
svn commit: r321509 - in /jakarta/httpclient/trunk/http-common/src:
examples/org/apache/http/examples/ java/org/apache/http/impl/
java/org/apache/http/impl/io/ test/org/apache/http/
test/org/apache/http/util/
Author: olegk
Date: Sat Oct 15 15:18:51 2005
New Revision: 321509
URL: http://svn.apache.org/viewcvs?rev=321509&view=rev
Log:
* Removed NIO specific code
* Removed Java 1.4 specific code from AbstractHttpConnection class
At this point only SSLSocketFactory contains references to Java 1.4 features
Removed:
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/io/NIOSocketFactory.java
Modified:
jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java
jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java
Modified: jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java?rev=321509&r1=321508&r2=321509&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java (original)
+++ jakarta/httpclient/trunk/http-common/src/examples/org/apache/http/examples/ElementalHttpEchoServer.java Sat Oct 15 15:18:51 2005
@@ -31,10 +31,8 @@
import java.io.IOException;
import java.io.InterruptedIOException;
-import java.net.InetSocketAddress;
+import java.net.ServerSocket;
import java.net.Socket;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
import org.apache.http.ConnectionClosedException;
import org.apache.http.Header;
@@ -159,23 +157,21 @@
static class RequestListenerThread extends Thread {
- private final ServerSocketChannel serverchannel;
+ private final ServerSocket serversocket;
private HttpParams params;
public RequestListenerThread(int port) throws IOException {
- this.serverchannel = ServerSocketChannel.open();
- this.serverchannel.socket().bind(new InetSocketAddress(port));
+ this.serversocket = new ServerSocket(port);
this.params = new DefaultHttpParams(null);
}
public void run() {
- System.out.println("Listening on port " + this.serverchannel.socket().getLocalPort());
+ System.out.println("Listening on port " + this.serversocket.getLocalPort());
while (!Thread.interrupted()) {
try {
- SocketChannel channel = this.serverchannel.accept();
- Socket socket = channel.socket();
+ Socket socket = this.serversocket.accept();
HttpServerConnection conn = new DefaultHttpServerConnection();
- System.out.println("Incoming connection from " + socket.getRemoteSocketAddress());
+ System.out.println("Incoming connection from " + socket.getInetAddress());
conn.bind(socket, this.params);
Thread t = new HttpConnectionThread(conn);
t.setDaemon(true);
Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java?rev=321509&r1=321508&r2=321509&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/AbstractHttpConnection.java Sat Oct 15 15:18:51 2005
@@ -142,24 +142,18 @@
this.datareceiver = null;
this.datatransmitter = null;
Socket tmpsocket = this.socket;
+ this.socket = null;
if (tmpsocket != null) {
- if (!tmpsocket.isClosed()) {
- if (!tmpsocket.isOutputShutdown()) {
- try {
- tmpsocket.shutdownOutput();
- } catch (IOException ignore) {
- }
- }
- if (!tmpsocket.isInputShutdown()) {
- try {
- tmpsocket.shutdownInput();
- } catch (IOException ignore) {
- }
- }
- tmpsocket.close();
- }
+ try {
+ tmpsocket.shutdownOutput();
+ } catch (IOException ignore) {
+ }
+ try {
+ tmpsocket.shutdownInput();
+ } catch (IOException ignore) {
+ }
+ tmpsocket.close();
}
- this.socket = null;
}
public boolean isStale() {
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java?rev=321509&r1=321508&r2=321509&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/TestHttpHost.java Sat Oct 15 15:18:51 2005
@@ -29,7 +29,6 @@
package org.apache.http;
-import org.apache.http.impl.io.NIOSocketFactory;
import org.apache.http.impl.io.PlainSocketFactory;
import org.apache.http.io.SocketFactory;
@@ -113,7 +112,7 @@
public void testHashCode() {
Scheme http = Scheme.getScheme("http");
Scheme myhttp = new Scheme("myhttp",
- NIOSocketFactory.getSocketFactory(), 8080);
+ PlainSocketFactory.getSocketFactory(), 8080);
HttpHost host1 = new HttpHost("somehost", 8080, http);
HttpHost host2 = new HttpHost("somehost", 80, http);
HttpHost host3 = new HttpHost("someotherhost", 8080, http);
@@ -132,7 +131,7 @@
public void testEquals() {
Scheme http = Scheme.getScheme("http");
Scheme myhttp = new Scheme("myhttp",
- NIOSocketFactory.getSocketFactory(), 8080);
+ PlainSocketFactory.getSocketFactory(), 8080);
HttpHost host1 = new HttpHost("somehost", 8080, http);
HttpHost host2 = new HttpHost("somehost", 80, http);
HttpHost host3 = new HttpHost("someotherhost", 8080, http);
@@ -153,7 +152,7 @@
public void testToString() {
Scheme http = Scheme.getScheme("http");
Scheme myhttp = new Scheme("myhttp",
- NIOSocketFactory.getSocketFactory(), 8080);
+ PlainSocketFactory.getSocketFactory(), 8080);
HttpHost host1 = new HttpHost("somehost");
assertEquals("http://somehost", host1.toString());
HttpHost host2 = new HttpHost("somehost", http.getDefaultPort());
Modified: jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java?rev=321509&r1=321508&r2=321509&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java (original)
+++ jakarta/httpclient/trunk/http-common/src/test/org/apache/http/util/TestExceptionUtils.java Sat Oct 15 15:18:51 2005
@@ -57,8 +57,6 @@
Exception ex1 = new Exception();
Exception ex2 = new Exception();
ExceptionUtil.initCause(ex1, ex2);
- assertNotNull(ex1.getCause());
- assertTrue(ex1.getCause() == ex2);
}
}