You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2014/09/08 12:28:41 UTC
git commit: Sadly,
the getSupportedSSLParameters() method is not available in Java 5.
Used getServerSocketFactory().getSupportedCipherSuites() instead.
Repository: mina
Updated Branches:
refs/heads/2.0 3cf5bcdc8 -> d500b2e97
Sadly, the getSupportedSSLParameters() method is not available in Java
5. Used getServerSocketFactory().getSupportedCipherSuites() instead.
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/d500b2e9
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d500b2e9
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d500b2e9
Branch: refs/heads/2.0
Commit: d500b2e9727675abe9c325da7587b20dcaf95890
Parents: 3cf5bcd
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Sep 8 12:28:23 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Sep 8 12:28:23 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/mina/filter/ssl/SslFilter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/d500b2e9/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index e5f65b4..84ace80 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -426,8 +426,9 @@ public class SslFilter extends IoFilterAdapter {
sslHandler.init();
// Adding the supported ciphers in the SSLHandler
- String[] ciphers = sslContext.getSupportedSSLParameters().getCipherSuites();
-
+ // In Java 6, we should call sslContext.getSupportedSSLParameters()
+ // instead
+ String[] ciphers = sslContext.getServerSocketFactory().getSupportedCipherSuites();
setEnabledCipherSuites(ciphers);
session.setAttribute(SSL_HANDLER, sslHandler);
}