Merge remote-tracking branch 'origin/2.1' into 2.1

This commit is contained in:
Rob Austin
2015-10-14 08:21:26 +01:00
@@ -621,7 +621,7 @@ final class ChannelProvider implements Closeable {
int removedPos = chronicleChannelPositionsInList[chronicleChannel];
if (removedPos == -1)
return;
chronicleChannelPositionsInList[removedPos] = -1;
chronicleChannelPositionsInList[chronicleChannel] = -1;
chronicleChannelList.remove(removedPos);
chronicleChannelIds.remove(removedPos);
for (int i = 0, len = chronicleChannelIds.size(); i < len; i++) {