Author: dbrosius Date: Wed Aug 30 14:34:41 2006 New Revision: 438640 URL: http://svn.apache.org/viewvc?rev=438640&view=rev Log: make sure instruction list iterator throws NoSuchElementException when the end of the list is done and a call to next() is made, and not NullPointerException
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java URL: http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java?rev=438640&r1=438639&r2=438640&view=diff ============================================================================== --- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java (original) +++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java Wed Aug 30 14:34:41 2006 @@ -25,6 +25,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; + import org.apache.bcel.Constants; import org.apache.bcel.classfile.Constant; import org.apache.bcel.util.ByteSequence; @@ -991,7 +993,9 @@ private InstructionHandle ih = start; - public Object next() { + public Object next() throws NoSuchElementException { + if (ih == null) + throw new NoSuchElementException(); InstructionHandle i = ih; ih = ih.next; return i; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]