diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
| commit | 4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d (patch) | |
| tree | cab68796af504ee4520c3c73dabb0754cbf72d81 /java/src | |
| parent | Additional fix for ICE_HAS_BZIP2 macro (diff) | |
| download | ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.bz2 ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.xz ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.zip | |
ICE-6196 added ProtocolInstance::secure()
Diffstat (limited to 'java/src')
5 files changed, 11 insertions, 27 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java index 716de82bb8a..eced02e5a1a 100644 --- a/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java @@ -90,6 +90,12 @@ public abstract class IPEndpointI extends EndpointI } @Override + public boolean secure() + { + return _instance.secure(); + } + + @Override public String connectionId() { return _connectionId; diff --git a/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java index 4be23d9f359..99ebdb0e2ec 100644 --- a/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java +++ b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java @@ -47,6 +47,11 @@ public class ProtocolInstance return _type; } + public boolean secure() + { + return _type == IceSSL.EndpointType.value || _type == Ice.WSSEndpointType.value; + } + public Ice.Properties properties() { return _properties; diff --git a/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java b/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java index 1358a24b1aa..be274252438 100644 --- a/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java @@ -130,15 +130,6 @@ final class TcpEndpointI extends IPEndpointI } // - // Return true if the endpoint is secure. - // - @Override - public boolean secure() - { - return false; - } - - // // Return a server side transceiver for this endpoint, or null if a // transceiver can only be created by an acceptor. // diff --git a/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java index 834d4eca127..1c211b3ab8d 100644 --- a/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java @@ -135,15 +135,6 @@ final class UdpEndpointI extends IPEndpointI } // - // Return true if the endpoint is secure. - // - @Override - public boolean secure() - { - return false; - } - - // // Return a server side transceiver for this endpoint, or null if a // transceiver can only be created by an acceptor. // diff --git a/java/src/Ice/src/main/java/IceSSL/EndpointI.java b/java/src/Ice/src/main/java/IceSSL/EndpointI.java index 04c02e01e65..8a922bf4e0d 100644 --- a/java/src/Ice/src/main/java/IceSSL/EndpointI.java +++ b/java/src/Ice/src/main/java/IceSSL/EndpointI.java @@ -133,15 +133,6 @@ final class EndpointI extends IceInternal.IPEndpointI } // - // Return true if the endpoint is secure. - // - @Override - public boolean secure() - { - return true; - } - - // // Return a server side transceiver for this endpoint, or null if a // transceiver can only be created by an acceptor. // |