# HG changeset patch
# User michaelm
# Date 1320939709 0
# Node ID cc6fd1f079de5133b7bdff3ea9aee1faae45cd40
# Parent  456742d6364351cf36cf8510034f9a99b6902618# Parent  27f7a2f3be206418c35477e8e0f55c246a06456a
Merge

diff -r 456742d63643 -r cc6fd1f079de jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java	Thu Nov 10 15:30:45 2011 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java	Thu Nov 10 15:41:49 2011 +0000
@@ -742,6 +742,8 @@
             throw new NullPointerException();
         if (c == this)
             throw new IllegalArgumentException();
+        if (maxElements <= 0)
+            return 0;
         final ReentrantLock lock = this.lock;
         lock.lock();
         try {
diff -r 456742d63643 -r cc6fd1f079de jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java	Thu Nov 10 15:30:45 2011 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java	Thu Nov 10 15:41:49 2011 +0000
@@ -332,7 +332,7 @@
         // Note: convention in all put/take/etc is to preset local var
         // holding count negative to indicate failure unless set.
         int c = -1;
-        Node<E> node = new Node(e);
+        Node<E> node = new Node<E>(e);
         final ReentrantLock putLock = this.putLock;
         final AtomicInteger count = this.count;
         putLock.lockInterruptibly();
@@ -412,7 +412,7 @@
         if (count.get() == capacity)
             return false;
         int c = -1;
-        Node<E> node = new Node(e);
+        Node<E> node = new Node<E>(e);
         final ReentrantLock putLock = this.putLock;
         putLock.lock();
         try {
@@ -728,6 +728,8 @@
             throw new NullPointerException();
         if (c == this)
             throw new IllegalArgumentException();
+        if (maxElements <= 0)
+            return 0;
         boolean signalNotFull = false;
         final ReentrantLock takeLock = this.takeLock;
         takeLock.lock();