summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/PluginI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-08-12 20:46:07 +0200
committerJose <jose@zeroc.com>2014-08-12 20:46:07 +0200
commita31393f368bc78281179e0e2c0ac2a37f7b849c1 (patch)
treea9b8ba6e228142bb522c976a766f41349b502bff /cpp/src/IceSSL/PluginI.cpp
parentAdded eclipse project settings for java. (diff)
downloadice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.bz2
ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.tar.xz
ice-a31393f368bc78281179e0e2c0ac2a37f7b849c1.zip
Fixed (ICE-5586) - Integrate IceWS to the Ice core library
Diffstat (limited to 'cpp/src/IceSSL/PluginI.cpp')
-rw-r--r--cpp/src/IceSSL/PluginI.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index 145089d026e..ef497abb53b 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -13,7 +13,9 @@
#include <IceSSL/EndpointI.h>
#include <IceSSL/EndpointInfo.h>
+#include <Ice/WSEndpointI.h>
#include <Ice/ProtocolPluginFacade.h>
+#include <Ice/ProtocolInstance.h>
#include <Ice/LocalException.h>
#include <Ice/Object.h>
@@ -55,7 +57,11 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator)
// in initialize, because the communicator may need to interpret
// proxies before the plug-in is fully initialized.
//
- facade->addEndpointFactory(new EndpointFactoryI(new Instance(_engine, EndpointType, "ssl")));
+ IceInternal::EndpointFactoryPtr sslFactory = new EndpointFactoryI(new Instance(_engine, EndpointType, "ssl"));
+ facade->addEndpointFactory(sslFactory);
+
+ IceInternal::ProtocolInstancePtr wssInstance = new IceInternal::ProtocolInstance(communicator, WSSEndpointType, "wss");
+ facade->addEndpointFactory(new IceInternal::WSEndpointFactoryI(wssInstance, sslFactory->clone(wssInstance)));
}
void