Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2019-05-01 19:04:59 -0400
committerslewis2019-05-01 19:04:59 -0400
commitc38db758af73cc4e29eec95d5767c19a364ce8de (patch)
tree2af5184551406c98cf0fd3cb8904dd008f9e283f
parente2f3919166add4a8184b21ac9f358c9f4cf45756 (diff)
downloadorg.eclipse.ecf-c38db758af73cc4e29eec95d5767c19a364ce8de.tar.gz
org.eclipse.ecf-c38db758af73cc4e29eec95d5767c19a364ce8de.tar.xz
org.eclipse.ecf-c38db758af73cc4e29eec95d5767c19a364ce8de.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=546894
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml2
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/src/org/eclipse/ecf/provider/filetransfer/httpclient4/HttpClientDefaultSSLSocketFactoryModifier.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
index e985c8928..4e1fd5720 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclient4;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclient4
-Bundle-Version: 1.1.300.qualifier
+Bundle-Version: 1.1.400.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient4.Activator
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
index 85690962f..9352a3f79 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.filetransfer.httpclient4</artifactId>
- <version>1.1.300-SNAPSHOT</version>
+ <version>1.1.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/src/org/eclipse/ecf/provider/filetransfer/httpclient4/HttpClientDefaultSSLSocketFactoryModifier.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/src/org/eclipse/ecf/provider/filetransfer/httpclient4/HttpClientDefaultSSLSocketFactoryModifier.java
index 2e4753ef9..f7f722a2c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/src/org/eclipse/ecf/provider/filetransfer/httpclient4/HttpClientDefaultSSLSocketFactoryModifier.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/src/org/eclipse/ecf/provider/filetransfer/httpclient4/HttpClientDefaultSSLSocketFactoryModifier.java
@@ -53,7 +53,7 @@ public class HttpClientDefaultSSLSocketFactoryModifier implements ISSLSocketFact
for (int i = 0; i < protocolNames.length; i++) {
try {
rtvContext = SSLContext.getInstance(protocolNames[i]);
- sslContext.init(null, new TrustManager[] {new HttpClientSslTrustManager()}, null);
+ rtvContext.init(null, new TrustManager[] {new HttpClientSslTrustManager()}, null);
break;
} catch (Exception e) {
// just continue

Back to the top