cluster: fix delivery-property.exchange-name set on updated messages.

Logging improvements, useful for debugging:
 - qpid/SessionState.cpp: show frame bodies with command IDs.
 - assign cluster-wide id number to each Event.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index 4d358cf495..898ec2879f 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -88,7 +88,7 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     void leave();
 
     // Update completed - called in update thread
-    void updateInDone(const ClusterMap&, uint64_t frameId);
+    void updateInDone(const ClusterMap&, uint64_t eventId, uint64_t frameId);
 
     MemberId getId() const;
     broker::Broker& getBroker() const;
@@ -214,6 +214,7 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     // Used only in deliveredFrame thread
     ClusterMap::Set elders;
     boost::intrusive_ptr<ExpiryPolicy> expiryPolicy;
+    uint64_t eventId;           // FIXME aconway 2009-03-04: review use for thread safety frame-q thread re-enabled.
     uint64_t frameId;
 
     // Used only during initialization
@@ -238,7 +239,6 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     ClusterMap map;
     size_t lastSize;
     bool lastBroker;
-    uint64_t sequence;
 
     //     Update related
     sys::Thread updateThread;