Author: dkulp
Date: Mon Jul 30 19:38:27 2012
New Revision: 1367244
URL: http://svn.apache.org/viewvc?rev=1367244&view=rev
Log:
Update to match latest changes on trunk
Modified:
cxf/sandbox/dkulp_async_clients/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Modified:
cxf/sandbox/dkulp_async_clients/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dkulp_async_clients/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1367244&r1=1367243&r2=1367244&view=diff
==============================================================================
---
cxf/sandbox/dkulp_async_clients/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
(original)
+++
cxf/sandbox/dkulp_async_clients/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Mon Jul 30 19:38:27 2012
@@ -24,8 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
@@ -77,7 +76,7 @@ public class AsyncHTTPConduit extends HT
this.factory = factory;
}
- protected void setupConnection(Message message, URL url, HTTPClientPolicy
csPolicy) throws IOException {
+ protected void setupConnection(Message message, URI uri, HTTPClientPolicy
csPolicy) throws IOException {
String httpRequestMethod =
(String)message.get(Message.HTTP_REQUEST_METHOD);
if (httpRequestMethod == null) {
@@ -94,11 +93,7 @@ public class AsyncHTTPConduit extends HT
entity.setChunked(true);
//entity.setContentLength(this.file.length());
entity.setContentType((String)message.get(Message.CONTENT_TYPE));
- try {
- e.setURI(url.toURI());
- } catch (URISyntaxException e1) {
- new IOException(e1);
- }
+ e.setURI(uri);
e.setEntity(entity);
message.put(CXFEntity.class, e);
}