From fa2da17046308a9aa0f879af3d1e220f9550a90b Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 19 Dec 2012 21:23:24 +0000
Subject: QPID-4514: Remove obsolete cluster code: MessageGroupManager,
 Messages

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424130 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/MessageGroupManager.cpp | 15 +--------------
 qpid/cpp/src/qpid/broker/Messages.h              |  7 -------
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
index 47e40a4794..0c70b6d448 100644
--- a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
@@ -302,19 +302,6 @@ void MessageGroupManager::setDefaults(const std::string& groupId)   // static
     defaultGroupId = groupId;
 }
 
-/** Cluster replication:
-
-   state map format:
-
-   { "group-state": [ {"name": <group-name>,
-                       "owner": <consumer-name>-or-empty,
-                       "acquired-ct": <acquired count>,
-                       "positions": [Seqnumbers, ... ]},
-                      {...}
-                    ]
-   }
-*/
-
 namespace {
     const std::string GROUP_NAME("name");
     const std::string GROUP_OWNER("owner");
@@ -368,7 +355,7 @@ void MessageGroupManager::setState(const qpid::framing::FieldTable& state)
     bool ok = state.getArray(GROUP_STATE, groupState);
     if (!ok) {
         QPID_LOG(error, "Unable to find message group state information for queue \"" <<
-                 qName << "\": cluster inconsistency error!");
+                 qName << "\"");
         return;
     }
 
diff --git a/qpid/cpp/src/qpid/broker/Messages.h b/qpid/cpp/src/qpid/broker/Messages.h
index a94ac7e0bf..cd846a4973 100644
--- a/qpid/cpp/src/qpid/broker/Messages.h
+++ b/qpid/cpp/src/qpid/broker/Messages.h
@@ -90,13 +90,6 @@ class Messages
      */
     virtual Message* find(const QueueCursor&) = 0;
 
-    /**
-     * Add an already acquired message to the queue.
-     * Used by a cluster updatee to replicate acquired messages from the updater.
-     * Only need be implemented by subclasses that keep track of
-     * acquired messages.
-     */
-    //virtual void updateAcquired(const QueuedMessage&) { }
     /**
      * Apply, the functor to each message held
      */
-- 
cgit v1.2.1