Author: markt
Date: Wed Jan 20 15:20:52 2016
New Revision: 1725739
URL: http://svn.apache.org/viewvc?rev=1725739&view=rev
Log:
Merge in a Javadoc fix from pool2 (update to latest trunk)
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 15:20:52 2016
@@ -1 +1 @@
-/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725736
+/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725738
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java?rev=1725739&r1=1725738&r2=1725739&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
Wed Jan 20 15:20:52 2016
@@ -417,8 +417,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @param e element to link
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whilst waiting
+ * for space
*/
public void putFirst(E e) throws InterruptedException {
if (e == null) {
@@ -440,8 +441,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @param e element to link
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whilst waiting
+ * for space
*/
public void putLast(E e) throws InterruptedException {
if (e == null) {
@@ -467,8 +469,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return {@code true} if successful, otherwise {@code false}
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whilst waiting
+ * for space
*/
public boolean offerFirst(E e, long timeout, TimeUnit unit)
throws InterruptedException {
@@ -500,8 +503,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return {@code true} if successful, otherwise {@code false}
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whist waiting
+ * for space
*/
public boolean offerLast(E e, long timeout, TimeUnit unit)
throws InterruptedException {
@@ -772,8 +776,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @param e element to link
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whilst waiting
+ * for space
*/
public void put(E e) throws InterruptedException {
putLast(e);
@@ -791,8 +796,9 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return {@code true} if successful, otherwise {@code false}
*
- * @throws NullPointerException
- * @throws InterruptedException
+ * @throws NullPointerException if e is null
+ * @throws InterruptedException if the thread is interrupted whilst waiting
+ * for space
*/
public boolean offer(E e, long timeout, TimeUnit unit)
throws InterruptedException {
@@ -897,10 +903,13 @@ class LinkedBlockingDeque<E> extends Abs
*
* @return number of elements added to the collection
*
- * @throws UnsupportedOperationException
- * @throws ClassCastException
- * @throws NullPointerException
- * @throws IllegalArgumentException
+ * @throws UnsupportedOperationException if the add operation is not
+ * supported by the specified collection
+ * @throws ClassCastException if the class of the elements held by this
+ * collection prevents them from being added to the specified
+ * collection
+ * @throws NullPointerException if c is null
+ * @throws IllegalArgumentException if c is this instance
*/
public int drainTo(Collection<? super E> c) {
return drainTo(c, Integer.MAX_VALUE);
@@ -914,10 +923,13 @@ class LinkedBlockingDeque<E> extends Abs
* @param maxElements maximum number of elements to remove from the queue
*
* @return number of elements added to the collection
- * @throws UnsupportedOperationException
- * @throws ClassCastException
- * @throws NullPointerException
- * @throws IllegalArgumentException
+ * @throws UnsupportedOperationException if the add operation is not
+ * supported by the specified collection
+ * @throws ClassCastException if the class of the elements held by this
+ * collection prevents them from being added to the specified
+ * collection
+ * @throws NullPointerException if c is null
+ * @throws IllegalArgumentException if c is this instance
*/
public int drainTo(Collection<? super E> c, int maxElements) {
if (c == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
