Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43D859915 for ; Sat, 26 Nov 2011 17:01:32 +0000 (UTC) Received: (qmail 76091 invoked by uid 500); 26 Nov 2011 17:01:31 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 76043 invoked by uid 500); 26 Nov 2011 17:01:31 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 76036 invoked by uid 99); 26 Nov 2011 17:01:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Nov 2011 17:01:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Nov 2011 17:01:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 425A223889D7 for ; Sat, 26 Nov 2011 17:01:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1206495 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java Date: Sat, 26 Nov 2011 17:01:10 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111126170110.425A223889D7@eris.apache.org> Author: sebb Date: Sat Nov 26 17:01:09 2011 New Revision: 1206495 URL: http://svn.apache.org/viewvc?rev=1206495&view=rev Log: Cannot use @inheritDoc with @throws Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java?rev=1206495&r1=1206494&r2=1206495&view=diff ============================================================================== --- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java Sat Nov 26 17:01:09 2011 @@ -301,8 +301,8 @@ public class LinkedBlockingDeque // BlockingDeque methods /** - * @throws IllegalStateException {@inheritDoc} - * @throws NullPointerException {@inheritDoc} + * @throws IllegalStateException + * @throws NullPointerException */ public void addFirst(E e) { if (!offerFirst(e)) @@ -310,8 +310,8 @@ public class LinkedBlockingDeque } /** - * @throws IllegalStateException {@inheritDoc} - * @throws NullPointerException {@inheritDoc} + * @throws IllegalStateException + * @throws NullPointerException */ public void addLast(E e) { if (!offerLast(e)) @@ -319,7 +319,7 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} + * @throws NullPointerException */ public boolean offerFirst(E e) { if (e == null) throw new NullPointerException(); @@ -333,7 +333,7 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} + * @throws NullPointerException */ public boolean offerLast(E e) { if (e == null) throw new NullPointerException(); @@ -347,8 +347,8 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public void putFirst(E e) throws InterruptedException { if (e == null) throw new NullPointerException(); @@ -363,8 +363,8 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public void putLast(E e) throws InterruptedException { if (e == null) throw new NullPointerException(); @@ -379,8 +379,8 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public boolean offerFirst(E e, long timeout, TimeUnit unit) throws InterruptedException { @@ -401,8 +401,8 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public boolean offerLast(E e, long timeout, TimeUnit unit) throws InterruptedException { @@ -423,7 +423,7 @@ public class LinkedBlockingDeque } /** - * @throws NoSuchElementException {@inheritDoc} + * @throws NoSuchElementException */ public E removeFirst() { E x = pollFirst(); @@ -432,7 +432,7 @@ public class LinkedBlockingDeque } /** - * @throws NoSuchElementException {@inheritDoc} + * @throws NoSuchElementException */ public E removeLast() { E x = pollLast(); @@ -523,7 +523,7 @@ public class LinkedBlockingDeque } /** - * @throws NoSuchElementException {@inheritDoc} + * @throws NoSuchElementException */ public E getFirst() { E x = peekFirst(); @@ -532,7 +532,7 @@ public class LinkedBlockingDeque } /** - * @throws NoSuchElementException {@inheritDoc} + * @throws NoSuchElementException */ public E getLast() { E x = peekLast(); @@ -621,16 +621,16 @@ public class LinkedBlockingDeque } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public void put(E e) throws InterruptedException { putLast(e); } /** - * @throws NullPointerException {@inheritDoc} - * @throws InterruptedException {@inheritDoc} + * @throws NullPointerException + * @throws InterruptedException */ public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException { @@ -705,20 +705,20 @@ public class LinkedBlockingDeque } /** - * @throws UnsupportedOperationException {@inheritDoc} - * @throws ClassCastException {@inheritDoc} - * @throws NullPointerException {@inheritDoc} - * @throws IllegalArgumentException {@inheritDoc} + * @throws UnsupportedOperationException + * @throws ClassCastException + * @throws NullPointerException + * @throws IllegalArgumentException */ public int drainTo(Collection c) { return drainTo(c, Integer.MAX_VALUE); } /** - * @throws UnsupportedOperationException {@inheritDoc} - * @throws ClassCastException {@inheritDoc} - * @throws NullPointerException {@inheritDoc} - * @throws IllegalArgumentException {@inheritDoc} + * @throws UnsupportedOperationException + * @throws ClassCastException + * @throws NullPointerException + * @throws IllegalArgumentException */ public int drainTo(Collection c, int maxElements) { if (c == null) @@ -742,15 +742,15 @@ public class LinkedBlockingDeque // Stack methods /** - * @throws IllegalStateException {@inheritDoc} - * @throws NullPointerException {@inheritDoc} + * @throws IllegalStateException + * @throws NullPointerException */ public void push(E e) { addFirst(e); } /** - * @throws NoSuchElementException {@inheritDoc} + * @throws NoSuchElementException */ public E pop() { return removeFirst(); @@ -833,10 +833,10 @@ public class LinkedBlockingDeque // * // * @param c collection containing elements to be added to this queue // * @return {@code true} if this queue changed as a result of the call -// * @throws ClassCastException {@inheritDoc} -// * @throws NullPointerException {@inheritDoc} -// * @throws IllegalArgumentException {@inheritDoc} -// * @throws IllegalStateException {@inheritDoc} +// * @throws ClassCastException +// * @throws NullPointerException +// * @throws IllegalArgumentException +// * @throws IllegalStateException // * @see #add(Object) // */ // public boolean addAll(Collection c) {