accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-4117 work around THRIFT-3450
Date Mon, 01 Feb 2016 17:31:34 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 7a6b48203 -> fed5dd50a


ACCUMULO-4117 work around THRIFT-3450


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d75e963d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d75e963d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d75e963d

Branch: refs/heads/master
Commit: d75e963de130ab8fe2dc1622b5683c51b54b0102
Parents: 664012d
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Mon Feb 1 12:30:31 2016 -0500
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Mon Feb 1 12:30:31 2016 -0500

----------------------------------------------------------------------
 .../accumulo/core/rpc/SslConnectionParams.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d75e963d/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
index f85ea10..017134e 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/SslConnectionParams.java
@@ -209,12 +209,24 @@ public class SslConnectionParams {
     return trustStoreType;
   }
 
+  // Work around THRIFT-3450 ... fixed with b9641e094...
+  static class TSSLTransportParametersHack extends TSSLTransportParameters {
+    TSSLTransportParametersHack(String clientProtocol) {
+      super(clientProtocol, new String[] {});
+      this.cipherSuites = null;
+    }
+  }
+
   public TSSLTransportParameters getTTransportParams() {
     if (useJsse)
       throw new IllegalStateException("Cannot get TTransportParams for JSEE configuration.");
 
-    // Null cipherSuites is implicitly handled
-    TSSLTransportParameters params = new TSSLTransportParameters(clientProtocol, cipherSuites);
+    TSSLTransportParameters params;
+    if (cipherSuites != null) {
+      params = new TSSLTransportParameters(clientProtocol, cipherSuites);
+    } else {
+      params = new TSSLTransportParametersHack(clientProtocol);
+    }
 
     params.requireClientAuth(clientAuth);
     if (keyStoreSet) {


Mime
View raw message