--- a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java	Thu Jul 12 22:53:35 2018 -0700
+++ b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java	Fri Jul 13 18:39:11 2018 +0200
@@ -194,10 +194,9 @@
 
     public static JavaNioAccess getJavaNioAccess() {
         if (javaNioAccess == null) {
-            // Ensure java.nio.ByteOrder is initialized; we know that
-            // this class initializes java.nio.Bits that provides the
+            // Ensure java.nio.Buffer is initialized, which provides the
             // shared secret.
-            unsafe.ensureClassInitialized(java.nio.ByteOrder.class);
+            unsafe.ensureClassInitialized(java.nio.Buffer.class);
         }
         return javaNioAccess;
     }