--- old/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java Wed Nov 9 14:31:44 2011 +++ new/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java Wed Nov 9 14:31:44 2011 @@ -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 { --- old/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java Wed Nov 9 14:31:45 2011 +++ new/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java Wed Nov 9 14:31:45 2011 @@ -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 node = new Node(e); + Node node = new Node(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 node = new Node(e); + Node node = new Node(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();