Fix cluster TTL: replicte expiry information to newcomers.

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

1 files changed, 3 insertions, 4 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index 5e66db0097..b716e2d781 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -92,7 +92,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&);
 
     MemberId getId() const;
     broker::Broker& getBroker() const;
@@ -108,6 +108,8 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     // Called only during update by Connection::shadowReady
     Decoder& getDecoder() { return decoder; }
 
+    ExpiryPolicy& getExpiryPolicy() { return *expiryPolicy; }
+    
   private:
     typedef sys::Monitor::ScopedLock Lock;
 
@@ -115,8 +117,6 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     typedef PollableQueue<EventFrame> PollableFrameQueue;
     typedef std::map<ConnectionId, ConnectionPtr> ConnectionMap;
 
-    // FIXME aconway 2009-03-07: sort functions by thread
-
     // NB: A dummy Lock& parameter marks functions that must only be
     // called with Cluster::lock  locked.
  
@@ -237,7 +237,6 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     } state;
 
     ConnectionMap connections;
-    uint64_t frameId;
     ClusterMap map;
     ClusterMap::Set elders;
     size_t lastSize;