You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2014/11/06 22:17:11 UTC
[2/3] flume git commit: FLUME-2441. HTTP Source Unit tests fail on
IBM JDK 7
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/8229cc38
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/8229cc38
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/8229cc38
Branch: refs/heads/flume-1.5
Commit: 8229cc38a56a024859625dc1011b0333370c0617
Parents: a593cdd
Author: Hari Shreedharan <ha...@gmail.com>
Authored: Tue Aug 5 13:54:07 2014 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Nov 6 13:16:36 2014 -0800
----------------------------------------------------------------------
.../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/8229cc38/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 ec3bd50..9ba0a8c 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
@@ -365,7 +365,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) {