--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Wed May 10 23:40:46 2017 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java	Thu May 11 12:55:53 2017 -0700
@@ -2857,7 +2857,7 @@
         } catch (NoSuchFieldException e) {
             throw new InternalError(e);
         }
-        return unsafe.compareAndSwapObject(this, offset, null, obj);
+        return unsafe.compareAndSetObject(this, offset, null, obj);
     }
 }