Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-03-16 21:37:40 +0000
committerslewis2009-03-16 21:37:40 +0000
commit80c2b4ef143d20c050b56fde08bf33bb88b4bf35 (patch)
treef52f557cd7527bddf9991124ece8609ac38515d8 /providers
parent1c4635eded95de3e387ed8d4aeebc3c6bf3f4ea2 (diff)
downloadorg.eclipse.ecf-80c2b4ef143d20c050b56fde08bf33bb88b4bf35.tar.gz
org.eclipse.ecf-80c2b4ef143d20c050b56fde08bf33bb88b4bf35.tar.xz
org.eclipse.ecf-80c2b4ef143d20c050b56fde08bf33bb88b4bf35.zip
Released patches from 268844 and 268758 to HEAD.
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java
index b1faa9580..ad96b68b2 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientFileSystemBrowser.java
@@ -287,7 +287,7 @@ public class HttpClientFileSystemBrowser extends AbstractFileSystemBrowser {
protected void setupProxy(Proxy proxy) {
if (proxy.getType().equals(Proxy.Type.HTTP)) {
final ProxyAddress address = proxy.getAddress();
- getHostConfiguration().setProxy(HttpClientRetrieveFileTransfer.getHostFromURL(address.getHostName()), address.getPort());
+ getHostConfiguration().setProxy(address.getHostName(), address.getPort());
final String proxyUsername = proxy.getUsername();
final String proxyPassword = proxy.getPassword();
if (proxyUsername != null) {
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
index 692d53bbb..badcfb378 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient/src/org/eclipse/ecf/provider/filetransfer/httpclient/HttpClientRetrieveFileTransfer.java
@@ -792,7 +792,7 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer
protected void setupProxy(Proxy proxy) {
if (proxy.getType().equals(Proxy.Type.HTTP)) {
final ProxyAddress address = proxy.getAddress();
- getHostConfiguration().setProxy(getHostFromURL(address.getHostName()), address.getPort());
+ getHostConfiguration().setProxy(address.getHostName(), address.getPort());
final String proxyUsername = proxy.getUsername();
final String proxyPassword = proxy.getPassword();
if (proxyUsername != null) {

Back to the top