summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/framing
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-07-02 22:35:33 +0000
committerAlan Conway <aconway@apache.org>2007-07-02 22:35:33 +0000
commit83b4417af81df92cb640de1694488156ba29d85f (patch)
tree630449e321fb571476080b737febd841e605ff2d /cpp/src/qpid/framing
parenta36bef1975b1d273a65dd0e74994106fbaad4389 (diff)
downloadqpid-python-83b4417af81df92cb640de1694488156ba29d85f.tar.gz
2007-06-30 <aconway@redhat.com>
* src/qpid/cluster/Cluster.cpp: Refactor - expose 4 handler points for all traffic to/from cluster. Removed HandlerUpdater functionality, separate class. Cluster only deals with membership and connecting the 4 handler points to CPG multicast. * src/tests/cluster.mk: Dropped newgrp ais wrapper scripts, its much simpler if the user just does "newgrp ais" before building. * src/tests/ais_check: Test script to check if users gid is ais and give clear notice if not. * src/tests/Cluster.cpp: Updated for changes to Cluster. * src/qpid/cluster/Cpg.cpp: Better messages for common errors. * Handler.h: Remove nextHandler() minor convenience is outweighted by risk of undetected errors if handlers that expect next() to be set are called when it's not set. * src/qpid/cluster/Cpg.cpp: Added logging. Replaced boost::function with traditional virtual interface (nasty stack traces.) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@552614 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/framing')
-rw-r--r--cpp/src/qpid/framing/Handler.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/qpid/framing/Handler.h b/cpp/src/qpid/framing/Handler.h
index f6b59393d9..2f09911325 100644
--- a/cpp/src/qpid/framing/Handler.h
+++ b/cpp/src/qpid/framing/Handler.h
@@ -36,6 +36,9 @@ template <class T> struct Handler {
/** Handler chains for incoming and outgoing traffic. */
struct Chains {
+ Chains() {}
+ Chains(Chain i, Chain o) : in(i), out(o) {}
+ Chains(Handler* i, Handler* o) : in(i), out(o) {}
Chain in;
Chain out;
};
@@ -48,12 +51,6 @@ template <class T> struct Handler {
/** Next handler. Public so chains can be modified by altering next. */
Chain next;
-
- protected:
- /** Derived handle() implementations call nextHandler to invoke the
- * next handler in the chain. */
- void nextHandler(T data) { if (next) next->handle(data); }
-
};
}}