Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-03-17 21:57:37 -0400
committerslewis2009-03-17 21:57:37 -0400
commitb046d8b96de174d229d9156bb02779b5710a4576 (patch)
tree2c8cb0c72bacf9e03fe1775cfcccdb4ca502c246 /providers/bundles/org.eclipse.ecf.provider.filetransfer
parente64a8c07150437dfbb08f11eef0495b9d7541e66 (diff)
downloadorg.eclipse.ecf-b046d8b96de174d229d9156bb02779b5710a4576.tar.gz
org.eclipse.ecf-b046d8b96de174d229d9156bb02779b5710a4576.tar.xz
org.eclipse.ecf-b046d8b96de174d229d9156bb02779b5710a4576.zip
Fixes for bug 269091, bug 269018, and 265551
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.filetransfer')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java5
2 files changed, 10 insertions, 3 deletions
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 345c171ee..06dc78c6e 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
@@ -908,4 +908,12 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
return null;
}
+ protected boolean targetHasGzSuffix(String target) {
+ if (target == null)
+ return false;
+ if (target.endsWith(".gz")) //$NON-NLS-1$
+ return true;
+ return false;
+ }
+
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java
index 19a234361..b2029eb8d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java
@@ -430,10 +430,9 @@ public class UrlConnectionRetrieveFileTransfer extends AbstractRetrieveFileTrans
if (null == encoding) {
return Compression.NONE;
- } else if (encoding.equalsIgnoreCase(CONTENT_ENCODING_GZIP)) {
+ // see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=269018
+ } else if (encoding.equalsIgnoreCase(CONTENT_ENCODING_GZIP) && !targetHasGzSuffix(remoteFileName)) {
return Compression.GZIP;
- // } else if (encoding.equalsIgnoreCase(CONTENT_ENCODING_DEFLATE)) {
- // return Compression.DEFLATE;
}
return Compression.NONE;
}

Back to the top