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

1 files changed, 3 insertions, 18 deletions

diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 71f1db1a675..65e076b9f09 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -35,7 +35,7 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& ho, Int
 IceSSL::EndpointI::EndpointI(const InstancePtr& instance) :
     IceInternal::IPEndpointI(instance),
     _instance(instance),
-    _timeout(-2),
+    _timeout(instance->defaultTimeout()),
     _compress(false)
 {
 }
@@ -279,23 +279,8 @@ void
 IceSSL::EndpointI::fillEndpointInfo(IPEndpointInfo* info) const
 {
     IPEndpointI::fillEndpointInfo(info);
-    EndpointInfo* sslInfo = dynamic_cast<EndpointInfo*>(info);
-    if(sslInfo)
-    {
-        sslInfo->timeout = _timeout;
-        sslInfo->compress = _compress;
-    }
-}
-
-void
-IceSSL::EndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
-{
-    IPEndpointI::initWithOptions(args, oaEndpoint);
-
-    if(_timeout == -2)
-    {
-        const_cast<Int&>(_timeout) = _instance->defaultTimeout();
-    }
+    info->timeout = _timeout;
+    info->compress = _compress;
 }
 
 bool