svn commit: r903862 - /qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp

[sh...@apache.org]

Author: shuston
Date: Wed Jan 27 22:06:52 2010
New Revision: 903862

URL: http://svn.apache.org/viewvc?rev=903862&view=rev
Log:
Write the correct port number to stdout when starting up. Resolves QPID-2366.

Modified:
    qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp

Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp?rev=903862&r1=903861&r2=903862&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp Wed Jan 27 22:06:52 2010
@@ -210,17 +210,17 @@
 struct ProcessControlOptions : public qpid::Options {
     bool quit;
     bool check;
-    //std::string transport;   No transport options yet - TCP is it.
+    std::string transport;
 
     ProcessControlOptions()
         : qpid::Options("Process control options"),
           quit(false),
-          check(false) //, transport(TCP)
+          check(false),
+          transport(TCP)
     {
-        // Only have TCP for now, so don't need this...
-        //            ("transport", optValue(transport, "TRANSPORT"), "The transport for which to return the port")
         addOptions()
             ("check,c", qpid::optValue(check), "Prints the broker's process ID to stdout and returns 0 if the broker is running, otherwise returns 1")
+            ("transport", qpid::optValue(transport, "TRANSPORT"), "The transport for which to return the port")
             ("quit,q", qpid::optValue(quit), "Tells the broker to shut down");
     }
 };
@@ -283,7 +283,7 @@
 
     // Need the correct port number to use in the pid file name.
     if (options->broker.port == 0)
-        options->broker.port = brokerPtr->getPort("");
+        options->broker.port = brokerPtr->getPort(myOptions->control.transport);
 
     BrokerInfo info;
     info.pid = ::GetCurrentProcessId();



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org