diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-09-24 12:35:38 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-24 12:35:38 +0200 |
commit | c74b14cc8d247109c8a877e4c9b948a9d9143d61 (patch) | |
tree | 87ad62ab9e03e960f6081fd55ec1483774e95a88 /cpp/src/Ice/WSEndpoint.cpp | |
parent | bug fix in IceGrid admin client (diff) | |
download | ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.tar.bz2 ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.tar.xz ice-c74b14cc8d247109c8a877e4c9b948a9d9143d61.zip |
Fixed ICE-5535, WSS hang and other minor issues
- ICE-5535: added support for parsing TCP/SSL/WS/WSS endpoints even if the transport isn't supported
- WSS implementation could hang under Java/C# if the SSL transport read too much data
- The opaque endpoint un-marshalling code in Java/C# could raise an EncapsulationException where it should have raised an UnarmshalOutOfBoundsException if the marshalled endpoint was invalid.
- Cleaned up JavaScript run methods for tests
- Few other minor fixes
Diffstat (limited to 'cpp/src/Ice/WSEndpoint.cpp')
-rw-r--r-- | cpp/src/Ice/WSEndpoint.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index b6290f1774a..f9eabad59d9 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -37,8 +37,7 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E } } -IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, - BasicStream* s) : +IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) : _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)) { s->read(const_cast<string&>(_resource), false); @@ -79,8 +78,6 @@ IceInternal::WSEndpoint::getInfo() const }; WSEndpointInfoPtr info = new InfoI(const_cast<WSEndpoint*>(this)); - info->timeout = _delegate->timeout(); - info->compress = _delegate->compress(); _delegate->fillEndpointInfo(info.get()); info->resource = _resource; return info; |