Get selected TCP listen port before building the pid file name; fixes regression introduced yesterday.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@828898 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 2 deletions

diff --git a/qpid/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp
index 05df32397a..fc4f9f8a92 100644
--- a/qpid/cpp/src/windows/QpiddBroker.cpp
+++ b/qpid/cpp/src/windows/QpiddBroker.cpp
@@ -239,6 +239,9 @@ int QpiddBroker::execute (QpiddOptions *options) {
                                            ": " +
                                            qpid::sys::strError(err)));
     }
+    // Need the correct port number to use in the pid file name.
+    if (options->broker.port == 0)
+        options->broker.port = brokerPtr->getPort("");
     qpid::sys::LockFile myPid(brokerPidFile(myOptions->control.piddir,
                                             options->broker.port),
                               true);
@@ -251,8 +254,6 @@ int QpiddBroker::execute (QpiddOptions *options) {
     ShutdownHandler waitShut(brokerPtr);
     qpid::sys::Thread waitThr(waitShut);   // Wait for shutdown event
     SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
-    if (options->broker.port == 0)
-        options->broker.port = brokerPtr->getPort("");
     brokerPtr->accept();
     std::cout << options->broker.port << std::endl;
     brokerPtr->run();