svn commit: r475753 - in /incubator/qpid/trunk/qpid/cpp/src/qpid: broker/Queue.cpp broker/SessionHandlerFactoryImpl.cpp broker/SessionHandlerFactoryImpl.h framing/AMQHeaderBody.cpp framing/FieldTable.cpp

[gsim]

Author: gsim
Date: Thu Nov 16 06:43:29 2006
New Revision: 475753

URL: http://svn.apache.org/viewvc?view=rev&rev=475753
Log:
Minor modifications for recovery and debug.


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?view=diff&rev=475753&r1=475752&r2=475753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Thu Nov 16 06:43:29 
2006
@@ -175,28 +175,28 @@
 
 void Queue::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const 
string * const xid)
 {
-    if(msg->isPersistent() && store){
+    if (msg->isPersistent() && store) {
         store->enqueue(ctxt, msg, *this, xid);
     }
 }
 
 void Queue::dequeue(TransactionContext* ctxt, Message::shared_ptr& msg, const 
string * const xid)
 {
-    if(msg->isPersistent() && store){
+    if (msg->isPersistent() && store) {
         store->dequeue(ctxt, msg, *this, xid);
     }
 }
 
 void Queue::create()
 {
-    if(store){
+    if (store) {
         store->create(*this);
     }
 }
 
 void Queue::destroy()
 {
-    if(store){
+    if (store) {
         store->destroy(*this);
     }
 }

Modified: 
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp?view=diff&rev=475753&r1=475752&r2=475753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp 
Thu Nov 16 06:43:29 2006
@@ -48,12 +48,10 @@
     exchanges.declare(amq_topic, TopicExchange::typeName);
     exchanges.declare(amq_fanout, FanOutExchange::typeName);
     exchanges.declare(amq_match, HeadersExchange::typeName);
-    cleaner.start();
-}
 
-void SessionHandlerFactoryImpl::recover()
-{
     if(store.get()) store->recover(queues);
+
+    cleaner.start();
 }
 
 SessionHandler* SessionHandlerFactoryImpl::create(SessionContext* ctxt)

Modified: 
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h?view=diff&rev=475753&r1=475752&r2=475753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h 
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h 
Thu Nov 16 06:43:29 2006
@@ -45,7 +45,6 @@
             AutoDelete cleaner;
         public:
             SessionHandlerFactoryImpl(const std::string& store = "", u_int32_t 
timeout = 30000);
-            void recover();
             virtual qpid::sys::SessionHandler* 
create(qpid::sys::SessionContext* ctxt);
             virtual ~SessionHandlerFactoryImpl();
         };

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp?view=diff&rev=475753&r1=475752&r2=475753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp Thu Nov 16 
06:43:29 2006
@@ -64,9 +64,12 @@
 
 void qpid::framing::AMQHeaderBody::print(std::ostream& out) const
 {
-    out << "header, content_size=" << getContentSize() 
-        << " (" << size() << " bytes)" << ", headers=" ;
+    out << "header (" << size() << " bytes)"  << " content_size=" << 
getContentSize();
     const BasicHeaderProperties* props =
         dynamic_cast<const BasicHeaderProperties*>(getProperties());
-    if (props) out << const_cast<BasicHeaderProperties*>(props)->getHeaders();
+    if (props) {
+        out << ", message_id=" << props->getMessageId(); 
+        out << ", delivery_mode=" << (int) props->getDeliveryMode(); 
+        out << ", headers=" << 
const_cast<BasicHeaderProperties*>(props)->getHeaders();
+    }
 }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp?view=diff&rev=475753&r1=475752&r2=475753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp Thu Nov 16 
06:43:29 2006
@@ -50,7 +50,7 @@
 }
 
 std::ostream& operator<<(std::ostream& out, const FieldTable& t) {
-    out << "field_table{";
+    out << "{";
     FieldTable::ValueMap::const_iterator i = t.getMap().begin();
     if (i != t.getMap().end()) out << *i++;
     while (i != t.getMap().end())