Added propertytoProxy

1 files changed, 33 insertions, 0 deletions

diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index 6fb0bed3245..df4aba6f999 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -24,6 +24,7 @@
 #include <IceE/StringUtil.h>
 #include <IceE/LoggerUtil.h>
 #include <IceE/Properties.h>
+#include <IceE/Communicator.h>
 
 using namespace std;
 using namespace Ice;
@@ -592,6 +593,38 @@ IceInternal::ReferenceFactory::create(const string& str)
 }
 
 ReferencePtr
+IceInternal::ReferenceFactory::createFromProperties(const string& propertyPrefix)
+{
+    PropertiesPtr properties = _instance->initializationData().properties;
+
+    ReferencePtr ref = create(properties->getProperty(propertyPrefix));
+    if(!ref)
+    {
+        return 0;
+    }
+
+#ifdef ICEE_HAS_LOCATOR
+    string property = propertyPrefix + ".Locator";
+    if(!properties->getProperty(property).empty())
+    {
+        ref = ref->changeLocator(
+            LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property)));
+    }
+#endif
+
+#ifdef ICEE_HAS_ROUTER
+    property = propertyPrefix + ".Router";
+    if(!properties->getProperty(property).empty())
+    {
+        ref = ref->changeRouter(
+            RouterPrx::uncheckedCast(_communicator->propertyToProxy(property)));
+    }
+#endif
+
+    return ref;
+}
+
+ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 {
     //