Author: aconway
Date: Wed Jan 23 09:41:00 2008
New Revision: 614587
URL: http://svn.apache.org/viewvc?rev=614587&view=rev
Log:
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.
Modified:
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in
incubator/qpid/trunk/qpid/cpp/examples/verify
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=614587&r1=614586&r2=614587&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Wed Jan 23 09:41:00 2008
@@ -17,12 +17,14 @@
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 @@
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)
Modified: incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in?rev=614587&r1=614586&r2=614587&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/examples/pub-sub/verify.in Wed Jan
23 09:41:00 2008
@@ -1,6 +1,7 @@
==== ./topic_publisher
====
==== remove_uuid topic_listener.out | sort
+====
Declaring queue: europe
Declaring queue: news
Declaring queue: usa
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify?rev=614587&r1=614586&r2=614587&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify Wed Jan 23 09:41:00 2008
@@ -49,7 +49,6 @@
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
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=614587&r1=614586&r2=614587&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Wed Jan 23
09:41:00 2008
@@ -49,7 +49,7 @@
}
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() :
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManager.cpp?rev=614587&r1=614586&r2=614587&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/SubscriptionManager.cpp Wed
Jan 23 09:41:00 2008
@@ -35,7 +35,8 @@
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(
