--- /dev/null	2016-03-29 09:06:22.243762170 +0200
+++ new/test/java/nio/Buffer/DirectBufferAllocOOMETest.java	2016-04-01 16:47:29.273838593 +0200
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.ref.Reference;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @test
+ * @bug 8149925
+ * @summary Test that DirectByteBuffer allocation throws OOME and doesn't block
+ *          indefinitely when MaxDirectMemorySize is exhausted
+ *
+ * @run main/othervm -XX:MaxDirectMemorySize=128m DirectBufferAllocOOMETest
+ */
+public class DirectBufferAllocOOMETest {
+    static final int CAPACITY = 1024 * 1024; // bytes
+    static volatile boolean wahr = true;
+
+    static void allocUntilOOME() throws OutOfMemoryError {
+        List<ByteBuffer> dbbs = new ArrayList<>();
+        while (wahr) {
+            dbbs.add(ByteBuffer.allocateDirect(CAPACITY));
+        }
+        Reference.reachabilityFence(dbbs);
+    }
+
+    public static void main(String[] args) {
+        try {
+            allocUntilOOME();
+            throw new IllegalStateException("Unexpected code path");
+        } catch (OutOfMemoryError x) {
+            // expected
+        }
+
+        // should succeed now
+        ByteBuffer.allocateDirect(CAPACITY);
+
+        try {
+            allocUntilOOME();
+            throw new IllegalStateException("Unexpected code path");
+        } catch (OutOfMemoryError x) {
+            // expected
+        }
+
+        // should succeed now
+        ByteBuffer.allocateDirect(CAPACITY);
+    }
+}