svn commit: r581214 - in /incubator/qpid/trunk/qpid/cpp/src/qpid: broker/Message.cpp framing/FrameSet.cpp framing/SendContent.cpp

[gsim]

Author: gsim
Date: Tue Oct  2 05:47:30 2007
New Revision: 581214

URL: http://svn.apache.org/viewvc?rev=581214&view=rev
Log:
Correction to interpretation of flags (B/E refer to the first/last segment in 
the frameset and should be set on all frames in such segments).


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=581214&r1=581213&r2=581214&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Tue Oct  2 
05:47:30 2007
@@ -154,12 +154,12 @@
             store->loadContent(*this, data, offset,
                                remaining > maxContentSize ? maxContentSize : 
remaining);
             frame.setBof(false);
+            frame.setEof(true);
             if (offset > 0) {
                 frame.setBos(false);
             }
             if (remaining) {
                 frame.setEos(false);
-                frame.setEof(false);
             }
             out.handle(frame);
         }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp?rev=581214&r1=581213&r2=581214&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.cpp Tue Oct  2 
05:47:30 2007
@@ -38,7 +38,7 @@
 
 bool FrameSet::isComplete() const
 {
-    return !parts.empty() && parts.back().getEof();
+    return !parts.empty() && parts.back().getEof() && parts.back().getEos();
 }
 
 bool FrameSet::isContentBearing() const

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp?rev=581214&r1=581213&r2=581214&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SendContent.cpp Tue Oct  2 
05:47:30 2007
@@ -60,7 +60,7 @@
 {
     f.setBof(false);
     f.setBos(first);
-    f.setEof(last);
+    f.setEof(true);//content is always the last segment
     f.setEos(last);
 }