6 files changed, 16 insertions, 0 deletions
diff --git a/cpp/src/Ice/ProtocolPluginFacade.cpp b/cpp/src/Ice/ProtocolPluginFacade.cpp
index 383ef5db4e2..7f7c3a822e3 100644
--- a/cpp/src/Ice/ProtocolPluginFacade.cpp
+++ b/cpp/src/Ice/ProtocolPluginFacade.cpp
@@ -38,6 +38,12 @@ IceInternal::ProtocolPluginFacade::getDefaultHost() const
     return _instance->defaultsAndOverrides()->defaultHost;
 }
 
+Ice::EncodingVersion
+IceInternal::ProtocolPluginFacade::getDefaultEncoding() const
+{
+    return _instance->defaultsAndOverrides()->defaultEncoding;
+}
+
 int
 IceInternal::ProtocolPluginFacade::getNetworkTraceLevel() const
 {
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index eb59bd8ea52..5443b055328 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -36,6 +36,7 @@ IceInternal::TcpEndpointI::TcpEndpointI(const InstancePtr& instance, const strin
 }
 
 IceInternal::TcpEndpointI::TcpEndpointI(const InstancePtr& instance, const string& str, bool oaEndpoint) :
+    EndpointI(Ice::currentProtocol, instance->defaultsAndOverrides()->defaultEncoding),
     _instance(instance),
     _port(0),
     _timeout(-1),
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 61a9a89bab7..e17ab77dd58 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -38,6 +38,7 @@ IceInternal::UdpEndpointI::UdpEndpointI(const InstancePtr& instance, const strin
 }
 
 IceInternal::UdpEndpointI::UdpEndpointI(const InstancePtr& instance, const string& str, bool oaEndpoint) :
+    EndpointI(Ice::currentProtocol, instance->defaultsAndOverrides()->defaultEncoding),
     _instance(instance),
     _port(0),
     _mcastTtl(-1),
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index e889e989aa2..4d389371d42 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -36,6 +36,7 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& ho, Int
 }
 
 IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& str, bool oaEndpoint) :
+    IceInternal::EndpointI(Ice::currentProtocol, instance->defaultEncoding()),
     _instance(instance),
     _port(0),
     _timeout(-1),
diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp
index 4b2a26e0ffa..7bb126e95c6 100644
--- a/cpp/src/IceSSL/Instance.cpp
+++ b/cpp/src/IceSSL/Instance.cpp
@@ -800,6 +800,12 @@ IceSSL::Instance::defaultHost() const
     return _facade->getDefaultHost();
 }
 
+Ice::EncodingVersion
+IceSSL::Instance::defaultEncoding() const
+{
+    return _facade->getDefaultEncoding();
+}
+
 int
 IceSSL::Instance::networkTraceLevel() const
 {
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index d332a251e3f..55af46a6c99 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -40,6 +40,7 @@ public:
     IceInternal::EndpointHostResolverPtr endpointHostResolver() const;
     IceInternal::ProtocolSupport protocolSupport() const;
     std::string defaultHost() const;
+    Ice::EncodingVersion defaultEncoding() const;
     int networkTraceLevel() const;
     std::string networkTraceCategory() const;
     int securityTraceLevel() const;