| commit | 6aeeb09df401c7128c8678fb0c7dd43f20d840a2 | [log] [tgz] |
|---|---|---|
| author | slewis <slewis> | Sat Feb 23 22:12:40 2008 +0000 |
| committer | slewis <slewis> | Sat Feb 23 22:12:40 2008 +0000 |
| tree | 02552942fb4c7313a29a2d77a411e96335ee6dda | |
| parent | c49665eae8c9b44a6ceabdc749b71382d435f751 [diff] |
Fix for not calling proxyService.isProxiesEnabled().
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java index 0af65a5..39243f6 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
@@ -294,7 +294,7 @@ try { IProxyService proxyService = Activator.getDefault().getProxyService(); // Only do this if platform service exists - if (proxyService != null) { + if (proxyService != null && proxyService.isProxiesEnabled()) { // Setup via proxyService entry URL target = getRemoteFileURL(); String type = IProxyData.SOCKS_PROXY_TYPE;
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java index 227473a..4e2383d 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
@@ -539,7 +539,7 @@ try { IProxyService proxyService = Activator.getDefault().getProxyService(); // Only do this if platform service exists - if (proxyService != null) { + if (proxyService != null && proxyService.isProxiesEnabled()) { // Setup via proxyService entry URL target = getRemoteFileURL(); final IProxyData[] proxies = proxyService.getProxyDataForHost(target.getHost());