svn commit: r481235 - in /incubator/qpid/trunk/qpid/cpp: lib/broker/BrokerMessage.cpp tests/MessageBuilderTest.cpp

[gsim]

Author: gsim
Date: Fri Dec  1 05:14:15 2006
New Revision: 481235

URL: http://svn.apache.org/viewvc?view=rev&rev=481235
Log:
Fix to test. Throw exception where previously printed warning.


Modified:
    incubator/qpid/trunk/qpid/cpp/lib/broker/BrokerMessage.cpp
    incubator/qpid/trunk/qpid/cpp/tests/MessageBuilderTest.cpp

Modified: incubator/qpid/trunk/qpid/cpp/lib/broker/BrokerMessage.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/broker/BrokerMessage.cpp?view=diff&rev=481235&r1=481234&r2=481235
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/broker/BrokerMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/broker/BrokerMessage.cpp Fri Dec  1 
05:14:15 2006
@@ -140,6 +140,7 @@
     u_int64_t expected = expectedContentSize();
     if (expected != buffer.available()) {
         std::cout << "WARN: Expected " << expectedContentSize() << " bytes, 
got " << buffer.available() << std::endl;
+        throw Exception("Cannot decode content, buffer not large enough.");
     }
 
     if (!chunkSize || chunkSize > expected) {

Modified: incubator/qpid/trunk/qpid/cpp/tests/MessageBuilderTest.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/MessageBuilderTest.cpp?view=diff&rev=481235&r1=481234&r2=481235
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/MessageBuilderTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/MessageBuilderTest.cpp Fri Dec  1 
05:14:15 2006
@@ -62,9 +62,9 @@
             }
         }
 
-        void appendContent(u_int64_t msgId, const string& data)
+        void appendContent(Message* msg, const string& data)
         {
-            if (msgId == 1) {
+            if (msg) {
                 content->putRawData(data);
             } else {
                 throw qpid::Exception("Invalid message id!");