Fix expect scripts for HA IceStorm. Clean up READMEs.

1 files changed, 4 insertions, 12 deletions

diff --git a/cpp/demo/IceStorm/replicated/Subscriber.cpp b/cpp/demo/IceStorm/replicated/Subscriber.cpp
index 9754af70bcd..1d7faf18673 100644
--- a/cpp/demo/IceStorm/replicated/Subscriber.cpp
+++ b/cpp/demo/IceStorm/replicated/Subscriber.cpp
@@ -150,19 +150,11 @@ Subscriber::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    IceStorm::TopicManagerPrx manager;
-    try
-    {
-        manager = IceStorm::TopicManagerPrx::checkedCast(communicator()->stringToProxy("DemoIceStorm/TopicManager"));
-        if(!manager)
-        {
-            cerr << appName() << ": invalid proxy" << endl;
-            return EXIT_FAILURE;
-        }
-    }
-    catch(const Ice::NotRegisteredException&)
+    IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(
+        communicator()->propertyToProxy("TopicManager.Proxy"));
+    if(!manager)
     {
-        cerr << appName() << ": no topic manager found, make sure application was deployed." << endl;
+        cerr << appName() << ": invalid proxy" << endl;
         return EXIT_FAILURE;
     }