Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3467 

Handle a potential NPE case.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1165797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2011-09-06 19:35:33 +00:00
parent 82e3be347c
commit 6e6d8605d3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
View File

@ -369,11 +369,13 @@ public class SequenceSet extends LinkedNodeList<Sequence> implements Iterable<Lo
private class SequenceIterator implements Iterator<Long> { private class SequenceIterator implements Iterator<Long> {
private Sequence currentEntry; private Sequence currentEntry;
private long lastReturned; private long lastReturned = -1;
public SequenceIterator() { public SequenceIterator() {
currentEntry = getHead(); currentEntry = getHead();
lastReturned = currentEntry.first - 1; if (currentEntry != null) {
lastReturned = currentEntry.first - 1;
}
} }
public boolean hasNext() { public boolean hasNext() {

10
kahadb/src/test/java/org/apache/kahadb/util/SequenceSetTest.java
View File

@ -126,4 +126,14 @@ public class SequenceSetTest {
assertEquals(expected[index++], iterator.next().longValue()); assertEquals(expected[index++], iterator.next().longValue());
} }
} }
@Test
public void testIteratorEmptySequenceSet() {
SequenceSet set = new SequenceSet();
Iterator<Long> iterator = set.iterator();
while(iterator.hasNext()) {
fail("Should not have any elements");
}
}
} }