Fix for ICE-5140 - an opaque endpoint which doesn't specify -e is assumed to be a 1.0 encoded endpoint

1 files changed, 3 insertions, 5 deletions

diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index cfad09c13e8..f33c5da2adb 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -10,20 +10,18 @@
 #include <Ice/OpaqueEndpointI.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Exception.h>
-#include <Ice/Instance.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/Base64.h>
 #include <Ice/HashUtil.h>
+#include <Ice/LocalException.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceInternal::OpaqueEndpointI::OpaqueEndpointI(const string& str, const InstancePtr& instance) : 
-    EndpointI("")
+IceInternal::OpaqueEndpointI::OpaqueEndpointI(const string& str) : 
+    EndpointI(""), _rawEncoding(Encoding_1_0)
 {
-    _rawEncoding = instance->defaultsAndOverrides()->defaultEncoding;
-
     const string delim = " \t\n\r";
 
     string::size_type beg;