QPID-1674 Mick Goulish: Fixes an error caused by a string going out of scope just before ForkedBroker startup.

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

3 files changed, 25 insertions, 21 deletions

diff --git a/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
index 82ffede3f9..dffc7cf6af 100644
--- a/qpid/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
@@ -210,6 +210,7 @@ struct ScheduledCreditTask : public TimerTask {
     {}
 
     void fire() {
+        QPID_LOG(critical, "ScheduledCreditTask fired"); // FIXME aconway 2009-02-23: REMOVE
         // This is the best we can currently do to avoid a destruction/fire race
         if (!isCancelled()) {
             if ( !sessionState.processSendCredit(0) ) {
diff --git a/qpid/cpp/src/tests/failover_soak.cpp b/qpid/cpp/src/tests/failover_soak.cpp
index 6149e845e4..129c6b9745 100644
--- a/qpid/cpp/src/tests/failover_soak.cpp
+++ b/qpid/cpp/src/tests/failover_soak.cpp
@@ -32,12 +32,17 @@
 #include <sstream>
 #include <vector>
 
+#include <boost/assign.hpp>
+
 #include <ForkedBroker.h>
 
 
 
 
+
 using namespace std;
+using boost::assign::list_of;
+
 
 
 typedef vector<ForkedBroker *> brokerVector;
@@ -275,24 +280,22 @@ startNewBroker ( brokerVector & brokers,
     module << moduleDir << "/cluster.so";
     path << srcRoot << "/qpidd";
     prefix << "soak-" << brokerId++;
-  
-    const char * const argv[] = 
-    {
-        "qpidd",
-        "-p0",
-        "--load-module=cluster.so",
-        "--cluster-name",
-        clusterName.c_str(),
-        "--auth=no", 
-        "--no-data-dir",
-        "--no-module-dir",
-        "--mgmt-enable=no",
-        "--log-prefix", prefix.str().c_str(),
-        0
-    };
-
-    size_t argc = sizeof(argv)/sizeof(argv[0]);
-    brokers.push_back ( new ForkedBroker ( argc, argv ) );
+
+    std::vector<std::string> argv = 
+        list_of<string> ("qpidd")
+                        ("--no-module-dir")
+                        ("--load-module=cluster.so")
+                        ("--cluster-name")
+                        (clusterName)
+                        ("--auth=no")
+                        ("--no-data-dir")
+                        ("--mgmt-enable=no")
+                        ("--log-prefix")
+                        (prefix.str())
+                        ("--log-to-file")
+                        ("/tmp/qpidd.log");
+
+    brokers.push_back ( new ForkedBroker ( argv ) );
 }
 
 
diff --git a/qpid/cpp/src/tests/federated_cluster_test b/qpid/cpp/src/tests/federated_cluster_test
index c518c0caed..ef0db4cb8e 100755
--- a/qpid/cpp/src/tests/federated_cluster_test
+++ b/qpid/cpp/src/tests/federated_cluster_test
@@ -21,8 +21,8 @@
 
 # Test reliability of the replication feature in the face of link
 # failures:
-MY_DIR=`dirname \`which $0\``
-PYTHON_DIR=${MY_DIR}/../../../python
+srcdir=`dirname $0`
+PYTHON_DIR=${srcdir}/../../../python
 
 trap stop_brokers EXIT
 
@@ -48,7 +48,7 @@ start_brokers() {
     BROKER_A=`cat fed.port.tmp`
 
     #...and start cluster
-    ./start_cluster 2 || fail "Could not start cluster"
+    $srcdir/start_cluster 2 || fail "Could not start cluster"
     NODE_1=$(head -1 cluster.ports)
     NODE_2=$(tail -1 cluster.ports)
 }