Repository: flume Updated Branches: refs/heads/flume-1.6 4a0c6c604 -> 24962ef3b
FLUME-2441. HTTP Source Unit tests fail on IBM JDK 7 (Li Xiang via Hari) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/24962ef3 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/24962ef3 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/24962ef3 Branch: refs/heads/flume-1.6 Commit: 24962ef3b04f4f2496349d901721622cc9d01bdd Parents: 4a0c6c6 Author: Hari Shreedharan <[email protected]> Authored: Tue Aug 5 13:54:07 2014 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Aug 5 13:55:34 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/flume/source/http/TestHTTPSource.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/24962ef3/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java index 5b07a6e..797eebb 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java @@ -353,7 +353,13 @@ public class TestHTTPSource { return null; } }}; - SSLContext sc = SSLContext.getInstance("SSL"); + + SSLContext sc = null; + if (System.getProperty("java.vendor").contains("IBM")) { + sc = SSLContext.getInstance("SSL_TLS"); + } else { + sc = SSLContext.getInstance("SSL"); + } HostnameVerifier hv = new HostnameVerifier() { public boolean verify(String arg0, SSLSession arg1) {
