natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

honor the iterator.next() contract for exceptions

This commit is contained in:
Dave Brosius 2014-11-04 21:55:10 -05:00
parent 87def12cb1
commit ea0cd4caad
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
View File

@ -22,12 +22,12 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NoSuchElementException;
import com.google.common.base.Function;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterables;
import net.nicoulaj.compilecommand.annotations.Inline;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.composites.CellName;
import org.apache.cassandra.db.composites.Composite;
@ -609,8 +609,17 @@ public class ArrayBackedSortedColumns extends ColumnFamily
public Cell next()
{
shouldCallNext = false;
return cells[idx--];
try
{
shouldCallNext = false;
return cells[idx--];
}
catch (ArrayIndexOutOfBoundsException e)
{
NoSuchElementException ne = new NoSuchElementException(e.getMessage());
ne.initCause(e);
throw ne;
}
}
public void remove()
@ -642,8 +651,17 @@ public class ArrayBackedSortedColumns extends ColumnFamily
public Cell next()
{
shouldCallNext = false;
return cells[idx++];
try
{
shouldCallNext = false;
return cells[idx++];
}
catch (ArrayIndexOutOfBoundsException e)
{
NoSuchElementException ne = new NoSuchElementException(e.getMessage());
ne.initCause(e);
throw ne;
}
}
public void remove()