Unverified Commit 5187208e authored by Dave Cridland's avatar Dave Cridland Committed by GitHub

Merge pull request #998 from annovanvliet/fixMucHistory

OF-1468 Group Chat History returns one message too many
parents 957541b4 fc682b88
...@@ -197,7 +197,7 @@ public class HistoryStrategy { ...@@ -197,7 +197,7 @@ public class HistoryStrategy {
// message because we want to preserve the room subject if // message because we want to preserve the room subject if
// possible. // possible.
Iterator<Message> historyIter = history.iterator(); Iterator<Message> historyIter = history.iterator();
while (historyIter.hasNext() && history.size() > strategyMaxNumber) { while (historyIter.hasNext() && history.size() >= strategyMaxNumber) {
if (historyIter.next() != roomSubject) { if (historyIter.next() != roomSubject) {
historyIter.remove(); historyIter.remove();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment