From 3e35392fcb2d496fa5da863adb42903416f44d44 Mon Sep 17 00:00:00 2001
From: Kenneth Anthony Giusti <kgiusti@apache.org>
Date: Wed, 2 Nov 2011 16:44:02 +0000
Subject: QPID-3577: assign null group identifiers to the default group

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1196682 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/MessageGroupManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/broker/MessageGroupManager.cpp b/cpp/src/qpid/broker/MessageGroupManager.cpp
index 77108c10d5..00d1a58bef 100644
--- a/cpp/src/qpid/broker/MessageGroupManager.cpp
+++ b/cpp/src/qpid/broker/MessageGroupManager.cpp
@@ -77,12 +77,15 @@ MessageGroupManager::GroupState& MessageGroupManager::findGroup( const QueuedMes
     if (headers) {
         qpid::framing::FieldTable::ValuePtr id = headers->get( groupIdHeader );
         if (id && id->convertsTo<std::string>()) {
-            group = id->get<std::string>();
+            std::string tmp = id->get<std::string>();
+            if (!tmp.empty())   // empty group is reserved
+                group = tmp;
         }
     }
 
     if (cachedGroup && group == lastGroup) {
         hits++;
+        lastMsg = thisMsg;
         return *cachedGroup;
     }
 
-- 
cgit v1.2.1