Author: markt
Date: Sun Dec 28 16:11:28 2008
New Revision: 729813
URL: http://svn.apache.org/viewvc?rev=729813&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46223
Throw NoSuchElementException if next() is called on the Iterator when
hasNext()==false
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=729813&r1=729812&r2=729813&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
Sun Dec 28 16:11:28 2008
@@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.NoSuchElementException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
@@ -428,6 +429,9 @@
}
public E next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
element = elements[index++];
return element;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
