Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=577867 and version
increment.
Change-Id: I8bf582c7e8d45ae015852f55babdd2a1960ad126
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
index 498e608..8bb678c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient5;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Vendor: %plugin.vendor
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient5
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml
index 23fd0c0..ce75535 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/pom.xml
@@ -9,7 +9,7 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.filetransfer.httpclient5</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/src/org/eclipse/ecf/provider/filetransfer/httpclient5/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/src/org/eclipse/ecf/provider/filetransfer/httpclient5/HttpClientRetrieveFileTransfer.java
index 0c0e2c5..0e5d707 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/src/org/eclipse/ecf/provider/filetransfer/httpclient5/HttpClientRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/src/org/eclipse/ecf/provider/filetransfer/httpclient5/HttpClientRetrieveFileTransfer.java
@@ -27,6 +27,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpStatus;
@@ -614,8 +615,10 @@
EntityUtils.consume(httpResponse.getEntity());
throw new IncomingFileTransferException(Messages.HttpClientRetrieveFileTransfer_Proxy_Auth_Required, code);
} else {
- Trace.trace(Activator.PLUGIN_ID, EntityUtils.toString(httpResponse.getEntity()));
- // EntityUtils.consume(httpResponse.getEntity());
+ HttpEntity httpResponseEntity = httpResponse.getEntity();
+ if (httpResponseEntity != null) {
+ Trace.trace(Activator.PLUGIN_ID, EntityUtils.toString(httpResponseEntity));
+ }
throw new IncomingFileTransferException(NLS.bind(Messages.HttpClientRetrieveFileTransfer_ERROR_GENERAL_RESPONSE_CODE, Integer.valueOf(code)), code);
}
} catch (final Exception e) {
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
index 3df0ef4..96536ab 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient5.feature"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml
index 7fb537a..a18cba7 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml
@@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.filetransfer.httpclient5.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
</project>
