# HG changeset patch
# User lancea
# Date 1464744448 14400
# Node ID 181a08b094a448769b1aebb829bedb4a974c20f2
# Parent  280093905c75d56ab4250e1b4070179f3be44b43
8158281: java_sql_Timestamp.java fails with AssertionError
Reviewed-by: mchung

diff -r 280093905c75 -r 181a08b094a4 jdk/src/java.desktop/share/classes/java/beans/MetaData.java
--- 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;