diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 16:44:02 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 16:44:02 +0000 |
| commit | 71b12c702231dcd10d42bb3988e4ed0a171982ab (patch) | |
| tree | 20c00aa04cc7372206b8a648cb79aee58801a6e0 | |
| parent | 85fbdb355e6b7a57323ee026be76087485278c8d (diff) | |
| download | qpid-python-71b12c702231dcd10d42bb3988e4ed0a171982ab.tar.gz | |
QPID-3577: assign null group identifiers to the default group
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1196682 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/MessageGroupManager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp index 77108c10d5..00d1a58bef 100644 --- a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp +++ b/qpid/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; } |