summaryrefslogtreecommitdiff
path: root/java/src/IceSSL/Instance.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2011-02-07 13:46:35 -0800
committerMark Spruiell <mes@zeroc.com>2011-02-07 13:46:35 -0800
commit139d6a7e6449eb87fedddd7b0a45fcc823b3665e (patch)
treeb3c1bc23395326a6f28be83e813fa2ed3b463a04 /java/src/IceSSL/Instance.java
parentfixing version in eclipse/CHANGES (diff)
downloadice-139d6a7e6449eb87fedddd7b0a45fcc823b3665e.tar.bz2
ice-139d6a7e6449eb87fedddd7b0a45fcc823b3665e.tar.xz
ice-139d6a7e6449eb87fedddd7b0a45fcc823b3665e.zip
fixes for Android compatibility
Diffstat (limited to 'java/src/IceSSL/Instance.java')
-rw-r--r--java/src/IceSSL/Instance.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index 633e3530e31..25dc8da8486 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -704,9 +704,17 @@ class Instance
}
javax.net.ssl.SSLEngine
- createSSLEngine(boolean incoming)
+ createSSLEngine(boolean incoming, java.net.InetSocketAddress peerAddr)
{
- javax.net.ssl.SSLEngine engine = _context.createSSLEngine();
+ javax.net.ssl.SSLEngine engine;
+ if(peerAddr != null)
+ {
+ engine = _context.createSSLEngine(peerAddr.getHostName(), peerAddr.getPort());
+ }
+ else
+ {
+ engine = _context.createSSLEngine();
+ }
engine.setUseClientMode(!incoming);
String[] cipherSuites = filterCiphers(engine.getSupportedCipherSuites(), engine.getEnabledCipherSuites());