diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-30 11:57:21 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-30 11:57:21 +0200 |
| commit | 06024a6fc1ceb70d70e41f93ba0016edefe36289 (patch) | |
| tree | 40f4bdf32862e466d059bbf0dd1a7293aa522604 /java/src/IceInternal/TcpEndpointI.java | |
| parent | Win32 fixes, C# port (diff) | |
| download | ice-06024a6fc1ceb70d70e41f93ba0016edefe36289.tar.bz2 ice-06024a6fc1ceb70d70e41f93ba0016edefe36289.tar.xz ice-06024a6fc1ceb70d70e41f93ba0016edefe36289.zip | |
Python port, added tests to Ice/info
Diffstat (limited to 'java/src/IceInternal/TcpEndpointI.java')
| -rw-r--r-- | java/src/IceInternal/TcpEndpointI.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java index 328c34a05b7..0d2ab229193 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/IceInternal/TcpEndpointI.java @@ -28,6 +28,7 @@ final class TcpEndpointI extends EndpointI public TcpEndpointI(Instance instance, String str, boolean oaEndpoint) { + super(Protocol.currentProtocol, instance.defaultsAndOverrides().defaultEncoding); _instance = instance; _host = null; _port = 0; @@ -171,6 +172,7 @@ final class TcpEndpointI extends EndpointI public TcpEndpointI(BasicStream s) { + super(new Ice.ProtocolVersion(), new Ice.EncodingVersion()); _instance = s.instance(); s.startReadEncaps(); _host = s.readString(); @@ -179,7 +181,9 @@ final class TcpEndpointI extends EndpointI _compress = s.readBool(); if(!s.getReadEncoding().equals(Ice.Util.Encoding_1_0)) { + _protocol = new Ice.ProtocolVersion(); _protocol.__read(s); + _encoding = new Ice.EncodingVersion(); _encoding.__read(s); } else |