From 4300a5a412cb7bc471c6b1d1a86189c150fb162f Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Tue, 31 May 2016 21:27:28 -0400
Subject: [PATCH] 8158281: java_sql_Timestamp.java fails with AssertionError

Reviewed-by: mchung
---
 jdk/src/java.desktop/share/classes/java/beans/MetaData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
index 4c3139d1dad..4110064bcd0 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -297,7 +297,7 @@ static final class java_sql_Timestamp_PersistenceDelegate extends java_util_Date
 
     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;