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 2013/07/05 14:39:28 UTC
svn commit: r1499987 - in /httpcomponents/httpcore/trunk/httpcore/src:
examples/org/apache/http/examples/ main/java/org/apache/http/impl/
Author: olegk
Date: Fri Jul 5 12:39:27 2013
New Revision: 1499987
URL: http://svn.apache.org/r1499987
Log:
Fixed Java 1.5 incompatibility (this really gets very annoying)
Modified:
httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java?rev=1499987&r1=1499986&r2=1499987&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java Fri Jul 5 12:39:27 2013
@@ -51,6 +51,7 @@ import org.apache.http.MethodNotSupporte
import org.apache.http.entity.ContentType;
import org.apache.http.entity.FileEntity;
import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.DefaultBHttpServerConnection;
import org.apache.http.impl.DefaultBHttpServerConnectionFactory;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpContext;
@@ -185,7 +186,7 @@ public class ElementalHttpServer {
static class RequestListenerThread extends Thread {
- private final HttpConnectionFactory<HttpServerConnection> connFactory;
+ private final HttpConnectionFactory<DefaultBHttpServerConnection> connFactory;
private final ServerSocket serversocket;
private final HttpService httpService;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java?rev=1499987&r1=1499986&r2=1499987&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java Fri Jul 5 12:39:27 2013
@@ -85,7 +85,6 @@ public class DefaultBHttpClientConnectio
this(null, null, null, null, null);
}
- @Override
public DefaultBHttpClientConnection createConnection(final Socket socket) throws IOException {
final DefaultBHttpClientConnection conn = new DefaultBHttpClientConnection(
this.cconfig.getBufferSize(),
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java?rev=1499987&r1=1499986&r2=1499987&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java Fri Jul 5 12:39:27 2013
@@ -85,7 +85,6 @@ public class DefaultBHttpServerConnectio
this(null, null, null, null, null);
}
- @Override
public DefaultBHttpServerConnection createConnection(final Socket socket) throws IOException {
final DefaultBHttpServerConnection conn = new DefaultBHttpServerConnection(
this.cconfig.getBufferSize(),