Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java2
2 files changed, 2 insertions, 2 deletions
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 0af65a539..39243f688 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 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
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 227473abb..4e2383dba 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 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
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());

Back to the top