From 5d45834ee35d7bf3b7656faa37d4c74be6d4f5b1 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Fri, 18 Dec 2015 09:59:25 +0100
Subject: [PATCH] 8145006: Collections.asLifoQueue(null) doesn't throw NPE as
 specified

Reviewed-by: smarks
---
 jdk/src/java.base/share/classes/java/util/Collections.java | 2 +-
 jdk/test/java/util/Collections/AsLifoQueue.java            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/java/util/Collections.java b/jdk/src/java.base/share/classes/java/util/Collections.java
index 5dcc7e8c6b0..73047bff5d1 100644
--- a/jdk/src/java.base/share/classes/java/util/Collections.java
+++ b/jdk/src/java.base/share/classes/java/util/Collections.java
@@ -5530,7 +5530,7 @@ public class Collections {
      * @since  1.6
      */
     public static <T> Queue<T> asLifoQueue(Deque<T> deque) {
-        return new AsLIFOQueue<>(deque);
+        return new AsLIFOQueue<>(Objects.requireNonNull(deque));
     }
 
     /**
diff --git a/jdk/test/java/util/Collections/AsLifoQueue.java b/jdk/test/java/util/Collections/AsLifoQueue.java
index 59c08e85c75..c573e32f49b 100644
--- a/jdk/test/java/util/Collections/AsLifoQueue.java
+++ b/jdk/test/java/util/Collections/AsLifoQueue.java
@@ -70,6 +70,8 @@ public class AsLifoQueue {
             check(q.isEmpty());
             equal(q.size(), 0);
         } catch (Throwable t) { unexpected(t); }
+
+        THROWS(NullPointerException.class, () -> Collections.asLifoQueue(null));
     }
 
     //--------------------- Infrastructure ---------------------------