summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/EndpointFactoryManager.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-24 12:35:38 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-24 12:35:38 +0200
commitc74b14cc8d247109c8a877e4c9b948a9d9143d61 (patch)
tree87ad62ab9e03e960f6081fd55ec1483774e95a88 /java/src/IceInternal/EndpointFactoryManager.java
parentbug fix in IceGrid admin client (diff)
downloadice-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 'java/src/IceInternal/EndpointFactoryManager.java')
-rw-r--r--java/src/IceInternal/EndpointFactoryManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index 64fd927c771..a0b2b1511d2 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -132,6 +132,7 @@ public final class EndpointFactoryManager
ue.streamWrite(bs);
Buffer buf = bs.getBuffer();
buf.b.position(0);
+ buf.b.limit(buf.size());
bs.readShort(); // type
bs.startReadEncaps();
EndpointI e = factory.read(bs);