merging javascript branch

1 files changed, 8 insertions, 5 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 19fa9701352..b407284e2a9 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -40,6 +40,7 @@
 #include <Ice/GC.h>
 #include <Ice/MetricsAdminI.h>
 #include <Ice/InstrumentationI.h>
+#include <Ice/ProtocolInstance.h>
  
 #include <IceUtil/UUID.h>
 #include <IceUtil/Mutex.h>
@@ -1097,15 +1098,17 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
         _endpointFactoryManager = new EndpointFactoryManager(this);
 #ifndef ICE_OS_WINRT
-        EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(this);
+        ProtocolInstancePtr tcpProtocolInstance = new ProtocolInstance(this, TCPEndpointType, "tcp");
+        EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(tcpProtocolInstance);
         _endpointFactoryManager->add(tcpEndpointFactory);
 #else
-        EndpointFactoryPtr tcpStreamEndpointFactory = new StreamEndpointFactory(this, TCPEndpointType);
+        EndpointFactoryPtr tcpStreamEndpointFactory = new StreamEndpointFactory(this, TCPEndpointType, "tcp");
         _endpointFactoryManager->add(tcpStreamEndpointFactory);
-        EndpointFactoryPtr sslStreamEndpointFactory = new StreamEndpointFactory(this, IceSSL::EndpointType);
+        EndpointFactoryPtr sslStreamEndpointFactory = new StreamEndpointFactory(this, IceSSL::EndpointType, "ssl");
         _endpointFactoryManager->add(sslStreamEndpointFactory);
 #endif
-        EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(this);
+        ProtocolInstancePtr udpProtocolInstance = new ProtocolInstance(this, UDPEndpointType, "udp");
+        EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(udpProtocolInstance);
         _endpointFactoryManager->add(udpEndpointFactory);
 
         _dynamicLibraryList = new DynamicLibraryList;