merging from plugins branch

1 files changed, 6 insertions, 2 deletions

diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index cd95d6a8b9a..2b3ce84f898 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.cpp
@@ -65,6 +65,12 @@ deleteLock(const string& name)
 int
 run(int argc, char* argv[], const CommunicatorPtr& communicator)
 {
+    PropertiesPtr properties = communicator->getProperties();
+
+    StringSeq args = argsToStringSeq(argc, argv);
+    args = properties->parseCommandLineOptions("IceStorm", args);
+    stringSeqToArgs(args, argc, argv);
+
     string lockfile = "subscriber.lock";
 
     if (argc != 1)
@@ -73,7 +79,6 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator)
     }
     createLock(lockfile);
 
-    PropertiesPtr properties = communicator->getProperties();
     const char* managerEndpointsProperty = "IceStorm.TopicManager.Endpoints";
     string managerEndpoints = properties->getProperty(managerEndpointsProperty);
     if (managerEndpoints.empty())
@@ -123,7 +128,6 @@ main(int argc, char* argv[])
 
     try
     {
-	addArgumentPrefix("IceStorm");
 	communicator = initialize(argc, argv);
 	status = run(argc, argv, communicator);
     }