summaryrefslogtreecommitdiff
path: root/cpp/src/IceBridge/IceBridge.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2018-02-09 07:46:33 -0800
committerMark Spruiell <mes@zeroc.com>2018-02-09 07:46:33 -0800
commit72e0f537b3da15073cff8a30d09f3dfb4d159b6c (patch)
tree8ce82e04240c5cd9f31b82fcb55bed6cb5169cc2 /cpp/src/IceBridge/IceBridge.cpp
parentAdded default arg for Process.getCommandLine (diff)
downloadice-72e0f537b3da15073cff8a30d09f3dfb4d159b6c.tar.bz2
ice-72e0f537b3da15073cff8a30d09f3dfb4d159b6c.tar.xz
ice-72e0f537b3da15073cff8a30d09f3dfb4d159b6c.zip
ICE-8648 - Make IceBridge usable as router-for-OA
Diffstat (limited to 'cpp/src/IceBridge/IceBridge.cpp')
-rw-r--r--cpp/src/IceBridge/IceBridge.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp
index f90a13434ac..da9a827e036 100644
--- a/cpp/src/IceBridge/IceBridge.cpp
+++ b/cpp/src/IceBridge/IceBridge.cpp
@@ -135,9 +135,13 @@ public:
return 0;
}
- virtual ObjectPrx getServerProxy(const Current&) const
+ virtual ObjectPrx getServerProxy(const Current& current) const
{
- return 0;
+ //
+ // We return a non-nil dummy proxy here so that a client is able to configure its
+ // callback object adapter with a router proxy.
+ //
+ return current.adapter->getCommunicator()->stringToProxy("dummy");
}
virtual ObjectProxySeq addProxies(const ObjectProxySeq&, const Current&)