qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r743131 - in /qpid/trunk/qpid/cpp/src: cluster.mk qpid/cluster/ConnectionDecoder.cpp qpid/cluster/ConnectionMap.cpp qpid/cluster/Decoder.cpp qpid/cluster/ThreadDispatch.cpp qpid/cluster/ThreadDispatch.h
Date Tue, 10 Feb 2009 22:16:05 GMT
Author: aconway
Date: Tue Feb 10 22:16:05 2009
New Revision: 743131

URL: http://svn.apache.org/viewvc?rev=743131&view=rev
Log:
Remove unused class and clean up some FIXME comments.

Removed:
    qpid/trunk/qpid/cpp/src/qpid/cluster/ThreadDispatch.cpp
    qpid/trunk/qpid/cpp/src/qpid/cluster/ThreadDispatch.h
Modified:
    qpid/trunk/qpid/cpp/src/cluster.mk
    qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionDecoder.cpp
    qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionMap.cpp
    qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp

Modified: qpid/trunk/qpid/cpp/src/cluster.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.mk?rev=743131&r1=743130&r2=743131&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.mk (original)
+++ qpid/trunk/qpid/cpp/src/cluster.mk Tue Feb 10 22:16:05 2009
@@ -74,8 +74,6 @@
   qpid/cluster/OutputInterceptor.h		\
   qpid/cluster/PollerDispatch.cpp		\
   qpid/cluster/PollerDispatch.h			\
-  qpid/cluster/ThreadDispatch.cpp		\
-  qpid/cluster/ThreadDispatch.h			\
   qpid/cluster/ProxyInputHandler.h		\
   qpid/cluster/Quorum.h				\
   qpid/cluster/WriteEstimate.cpp		\

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionDecoder.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionDecoder.cpp?rev=743131&r1=743130&r2=743131&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionDecoder.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionDecoder.cpp Tue Feb 10 22:16:05 2009
@@ -40,12 +40,14 @@
             handler(EventFrame(eh, frame));
             frame = decoder.frame;
         }
-        handler(EventFrame(eh, frame, 1)); // Set read-credit on the last frame.
+        // Set read-credit on the last frame ending in this event.
+        // Credit will be given when this frame is processed.
+        handler(EventFrame(eh, frame, 1)); 
     }
     else {
         // We must give 1 unit read credit per event.
-        // This event does not contain any complete frames so 
-        // we must give read credit directly.
+        // This event does not complete any frames so 
+        // we give read credit directly.
         ConnectionPtr connection = map.getLocal(eh.getConnectionId());
         if (connection)
             connection->giveReadCredit(1);

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionMap.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionMap.cpp?rev=743131&r1=743130&r2=743131&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionMap.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionMap.cpp Tue Feb 10 22:16:05 2009
@@ -56,7 +56,8 @@
         mgmtId << id;
         ConnectionPtr cp = new Connection(cluster, shadowOut, mgmtId.str(), id);
         std::pair<Map::iterator, bool> ib = map.insert(Map::value_type(id, cp)); 
-        assert(ib.second);      // FIXME aconway 2009-02-03: exception.
+        if (!ib.second)
+            throw InternalErrorException(QPID_MSG("Duplicate entry in cluster connection
map: " << id));
         i = ib.first;
     }
     return i->second;

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp?rev=743131&r1=743130&r2=743131&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp Tue Feb 10 22:16:05 2009
@@ -39,7 +39,7 @@
 
 void Decoder::erase(const ConnectionId& c) {
     Map::iterator i = map.find(c);
-    if (i != map.end())     // FIXME aconway 2009-02-03: 
+    if (i != map.end()) 
         map.erase(i);
 }
 



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message