Repository: flume Updated Branches: refs/heads/trunk 49db6f591 -> 2ef2055d4
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/2ef2055d Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2ef2055d Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2ef2055d Branch: refs/heads/trunk Commit: 2ef2055d44986c4249bcf1e64aa39fbfc0c356df Parents: 49db6f5 Author: Hari Shreedharan <[email protected]> Authored: Tue Aug 5 13:54:07 2014 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Aug 5 13:54:07 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/2ef2055d/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) {
