summaryrefslogtreecommitdiff
path: root/java/src/IceSSL/Instance.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-12-19 22:06:38 +0100
committerBenoit Foucher <benoit@zeroc.com>2007-12-19 22:06:38 +0100
commitf6121ea342641eb36f7cd67c7c877a1c70ec3055 (patch)
treeb545f3a2548b81fd8dd56a87a58f98b992c0066b /java/src/IceSSL/Instance.java
parentMerge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff)
downloadice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.bz2
ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.xz
ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.zip
- Merge IPv6 support from Dwayne's branch.
- Reviewed and fixed IPv6 bugs. - Fixed bug in the outgoing connection factory where an assert could be triggered if the proxy contained identical endpoints
Diffstat (limited to 'java/src/IceSSL/Instance.java')
-rw-r--r--java/src/IceSSL/Instance.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java
index 9d0251c5c13..861ed1f7c70 100644
--- a/java/src/IceSSL/Instance.java
+++ b/java/src/IceSSL/Instance.java
@@ -513,6 +513,12 @@ class Instance
return _facade.getEndpointHostResolver();
}
+ int
+ protocolSupport()
+ {
+ return _facade.getProtocolSupport();
+ }
+
String
defaultHost()
{