--- a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java	Tue May 31 17:54:41 2016 -0700
+++ b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java	Tue May 31 21:27:28 2016 -0400
@@ -297,7 +297,7 @@
 
     private static Method getNanosMethod() {
         try {
-            Class<?> c = Class.forName("java.sql.Timestamp", true, null);
+            Class<?> c = Class.forName("java.sql.Timestamp", true, ClassLoader.getPlatformClassLoader());
             return c.getMethod("getNanos");
         } catch (ClassNotFoundException e) {
             return null;