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());