[rhmessaging-commits] rhmessaging commits: r4459 - store/trunk/cpp/lib.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2011-05-13 09:49:52 -0400 (Fri, 13 May 2011)
New Revision: 4459

Modified:
   store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Improved null persistence Id exception message

Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp	2011-05-10 15:35:17 UTC (rev 4458)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp	2011-05-13 13:49:52 UTC (rev 4459)
@@ -1362,12 +1362,12 @@
     checkInit();
     u_int64_t queueId (queue.getPersistenceId());
     u_int64_t messageId (msg->getPersistenceId());
+    if (queueId == 0) {
+        THROW_STORE_EXCEPTION("Queue \"" + queue.getName() + "\" has null queue Id (has not been created)");
+    }
     if (messageId == 0) {
-        THROW_STORE_EXCEPTION("Error dequeuing message, persistence id not set");
+        THROW_STORE_EXCEPTION("Queue \"" + queue.getName() + "\": Dequeuing message with null persistence Id.");
     }
-    if (queueId == 0) {
-        THROW_STORE_EXCEPTION("Queue not created: " + queue.getName());
-    }
 
     TxnCtxt implicit;
     TxnCtxt* txn = 0;