diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 15:58:42 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-11-02 15:58:42 +0000 |
| commit | d1706c12d6c12a41a3607be6ac1f99e3c9adfd92 (patch) | |
| tree | d6984bc55a95af37ca7fd75bd53fbf4e8212b6ff /cpp/src | |
| parent | aa47a281449f8590baed80869d7fd33bc5fc7860 (diff) | |
| download | qpid-python-d1706c12d6c12a41a3607be6ac1f99e3c9adfd92.tar.gz | |
QPID-3577: undo commit - qpidd.1 changes should not have been committed
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1196656 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/MessageGroupManager.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/MessageGroupManager.cpp b/cpp/src/qpid/broker/MessageGroupManager.cpp index 00d1a58bef..77108c10d5 100644 --- a/cpp/src/qpid/broker/MessageGroupManager.cpp +++ b/cpp/src/qpid/broker/MessageGroupManager.cpp @@ -77,15 +77,12 @@ MessageGroupManager::GroupState& MessageGroupManager::findGroup( const QueuedMes if (headers) { qpid::framing::FieldTable::ValuePtr id = headers->get( groupIdHeader ); if (id && id->convertsTo<std::string>()) { - std::string tmp = id->get<std::string>(); - if (!tmp.empty()) // empty group is reserved - group = tmp; + group = id->get<std::string>(); } } if (cachedGroup && group == lastGroup) { hits++; - lastMsg = thisMsg; return *cachedGroup; } |