examples/Makefile.am:

 - verify.tar target, tars up verify script for easy transport to installation.

examples/examples/pub-sub/verify.in: fixed typeo. 
examples/verify: don't kill the pub-sub listener, it should exit gracefully.

src/qpid/client/Dispatcher.cpp
src/qpid/client/SubscriptionManager.cpp
 - Fix uninitialized autoStop member variable.


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

5 files changed, 11 insertions, 4 deletions

diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am
index e5fc509eac..aa68c151ab 100644
--- a/qpid/cpp/examples/Makefile.am
+++ b/qpid/cpp/examples/Makefile.am
@@ -17,12 +17,14 @@ nobase_pkgdata_DATA=						\
 	examples/direct/listener.cpp				\
 	examples/direct/declare_queues.cpp
 
-EXTRA_DIST=$(nobase_pkgdata_DATA) verify \
+VERIFY_SCRIPT=verify \
 	examples/request-response/verify.in \
 	examples/fanout/verify.in \
 	examples/pub-sub/verify.in \
 	examples/direct/verify.in 
 
+EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_SCRIPT)
+
 # Note: we don't use normal automake SUBDIRS because the example
 # makefiles don't understand all the recursive automake targets.
 
@@ -51,3 +53,7 @@ installcheck-local:
 	cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(VERIFY)
 	cd $(EXAMPLE_DIR) && $(MAKE) clean
 
+# Tarball with verify script that can be untarred & run on
+# installed examples.
+verify.tar: $(VERIFY_SCRIPT)
+	tar cf verify.tar $(VERIFY_SCRIPT)
diff --git a/qpid/cpp/examples/examples/pub-sub/verify.in b/qpid/cpp/examples/examples/pub-sub/verify.in
index aa3227388a..0a36b8c5ee 100644
--- a/qpid/cpp/examples/examples/pub-sub/verify.in
+++ b/qpid/cpp/examples/examples/pub-sub/verify.in
@@ -1,6 +1,7 @@
 ==== ./topic_publisher
 ====
 ==== remove_uuid topic_listener.out | sort
+====
 Declaring queue: europe
 Declaring queue: news
 Declaring queue: usa
diff --git a/qpid/cpp/examples/verify b/qpid/cpp/examples/verify
index 10f2226aa5..35c9acae88 100755
--- a/qpid/cpp/examples/verify
+++ b/qpid/cpp/examples/verify
@@ -49,7 +49,6 @@ pub_sub() {
     run ./topic_listener | tee topic_listener.out > topic_listener.wait &
     waitfor topic_listener.wait  "Listening"
     run ./topic_publisher > verify.out
-    kill %%
     wait 2> /dev/null
     title "remove_uuid topic_listener.out | sort" >> verify.out
 }
diff --git a/qpid/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
index 6b6a76b222..f4a7ff54d8 100644
--- a/qpid/cpp/src/qpid/client/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp
@@ -49,7 +49,7 @@ void Subscriber::received(Message& msg)
 }
 
 Dispatcher::Dispatcher(Session_0_10& s, const std::string& q)
-    : session(s), running(false)
+    : session(s), running(false), autoStop(true)
 {
     queue = q.empty() ? 
         session.getExecution().getDemux().getDefault() : 
diff --git a/qpid/cpp/src/qpid/client/SubscriptionManager.cpp b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
index ec2f7000ef..7289997a69 100644
--- a/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
@@ -35,7 +35,8 @@ namespace client {
 SubscriptionManager::SubscriptionManager(Session_0_10& s)
     : dispatcher(s), session(s),
       messages(UNLIMITED), bytes(UNLIMITED), window(true),
-      confirmMode(true), acquireMode(false)
+      confirmMode(true), acquireMode(false),
+      autoStop(true)
 {}
 
 Completion SubscriptionManager::subscribeInternal(