diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 15:37:03 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 15:37:03 +0000 |
| commit | df2027a432879efc5e9708e2d381b066fae84a49 (patch) | |
| tree | 479a5b76e6aa891694c3c46f709cacb25de25c7f /qpid/cpp/src | |
| parent | 5e6d14c5486772c9ec4edcb8b952395e11c5973c (diff) | |
| download | qpid-python-df2027a432879efc5e9708e2d381b066fae84a49.tar.gz | |
QPID-3577: assign null group names to the default group
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1196635 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -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; } |