From 3ed7df0bb26d82b63a2d0a2f47db79693220cb02 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Wed, 19 Jun 2013 14:52:11 +0000
Subject: NO-JIRA: remove unused code

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494646 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/Queue.cpp | 31 -------------------------------
 qpid/cpp/src/qpid/broker/Queue.h   |  9 ---------
 2 files changed, 40 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index cbc5c86dad..e1782b01ce 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -178,8 +178,6 @@ Queue::Queue(const string& _name, const QueueSettings& _settings,
     consumerCount(0),
     browserCount(0),
     exclusive(0),
-    persistLastNode(false),
-    inLastNodeFailure(false),
     messages(new MessageDeque()),
     persistenceId(0),
     settings(b ? merge(_settings, b->getOptions()) : _settings),
@@ -795,31 +793,6 @@ bool Queue::canAutoDelete() const
     return settings.autodelete && !consumerCount && !owner;
 }
 
-void Queue::clearLastNodeFailure()
-{
-    inLastNodeFailure = false;
-}
-
-void Queue::forcePersistent(const Message& /*message*/)
-{
-    //TODO
-}
-
-void Queue::setLastNodeFailure()
-{
-    if (persistLastNode){
-        Mutex::ScopedLock locker(messageLock);
-        try {
-            messages->foreach(boost::bind(&Queue::forcePersistent, this, _1));
-        } catch (const std::exception& e) {
-            // Could not go into last node standing (for example journal not large enough)
-            QPID_LOG(error, "Unable to fail to last node standing for queue: " << name << " : " << e.what());
-        }
-        inLastNodeFailure = true;
-    }
-}
-
-
 /*
  * return true if enqueue succeeded and message should be made
  * available; returning false will result in the message being dropped
@@ -837,10 +810,6 @@ bool Queue::enqueue(TransactionContext* ctxt, Message& msg)
         }
     }
 
-    if (inLastNodeFailure && persistLastNode){
-        forcePersistent(msg);
-    }
-
     if (settings.traceId.size()) {
         msg.addTraceId(settings.traceId);
     }
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 8b8ef442b2..29b711075a 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -129,8 +129,6 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     uint32_t consumerCount;     // Actually a count of all subscriptions, acquiring or not.
     uint32_t browserCount;      // Count of non-acquiring subscriptions.
     OwnershipToken* exclusive;
-    bool persistLastNode;
-    bool inLastNodeFailure;
     std::vector<std::string> traceExclude;
     QueueListeners listeners;
     std::auto_ptr<Messages> messages;
@@ -200,7 +198,6 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     bool acquire(const qpid::framing::SequenceNumber& position, Message& msg,
                  const qpid::sys::Mutex::ScopedLock& locker);
 
-    void forcePersistent(const Message& msg);
     int getEventMode();
     void dequeueFromStore(boost::intrusive_ptr<PersistableMessage>);
     void abandoned(const Message& message);
@@ -313,12 +310,6 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     QPID_BROKER_EXTERN bool canAutoDelete() const;
     const QueueBindings& getBindings() const { return bindings; }
 
-    /**
-     * used to take messages from in memory and flush down to disk.
-     */
-    QPID_BROKER_EXTERN void setLastNodeFailure();
-    QPID_BROKER_EXTERN void clearLastNodeFailure();
-
     /**
      * dequeue from store (only done once messages is acknowledged)
      */
-- 
cgit v1.2.1