diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-01 18:15:57 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-01 18:15:57 +0100 |
| commit | ba166110beb86f147aac6d221c9c41a1fb45d797 (patch) | |
| tree | 657d223239f76d16cf265ac95ce0b6b8813471da /java/src | |
| parent | Ice:/8929351 - remove tp_libidr/tp_bindir (diff) | |
| download | ice-ba166110beb86f147aac6d221c9c41a1fb45d797.tar.bz2 ice-ba166110beb86f147aac6d221c9c41a1fb45d797.tar.xz ice-ba166110beb86f147aac6d221c9c41a1fb45d797.zip | |
Fix for ICE-5140 - an opaque endpoint which doesn't specify -e is assumed to be a 1.0 encoded endpoint
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/EndpointFactoryManager.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/OpaqueEndpointI.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java index a0bbfbc95fa..b3c666c4c6a 100644 --- a/java/src/IceInternal/EndpointFactoryManager.java +++ b/java/src/IceInternal/EndpointFactoryManager.java @@ -97,7 +97,7 @@ public final class EndpointFactoryManager // if(protocol.equals("opaque")) { - EndpointI ue = new OpaqueEndpointI(s.substring(m.end()), _instance); + EndpointI ue = new OpaqueEndpointI(s.substring(m.end())); for(int i = 0; i < _factories.size(); i++) { EndpointFactory f = _factories.get(i); diff --git a/java/src/IceInternal/OpaqueEndpointI.java b/java/src/IceInternal/OpaqueEndpointI.java index 3821eecfcb9..de10f8d1bc6 100644 --- a/java/src/IceInternal/OpaqueEndpointI.java +++ b/java/src/IceInternal/OpaqueEndpointI.java @@ -12,11 +12,11 @@ package IceInternal; final class OpaqueEndpointI extends EndpointI { public - OpaqueEndpointI(String str, Instance instance) + OpaqueEndpointI(String str) { super(""); - _rawEncoding = instance.defaultsAndOverrides().defaultEncoding; + _rawEncoding = Ice.Util.Encoding_1_0; int topt = 0; int vopt = 0; |