--- a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template	Fri Jul 24 18:57:04 2015 +0200
+++ b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template	Fri Jul 24 11:52:30 2015 -0700
@@ -216,7 +216,7 @@
 #if[rw]
         if (src instanceof Heap$Type$Buffer) {
             if (src == this)
-                throw new IllegalArgumentException();
+                throw createSameBufferException();
             Heap$Type$Buffer sb = (Heap$Type$Buffer)src;
             int n = sb.remaining();
             if (n > remaining())