--- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java	Tue Mar 15 13:48:26 2016 -0700
+++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java	Thu Mar 17 19:04:16 2016 +0000
@@ -102,8 +102,8 @@
         Locale locale = Locale.getDefault();
 
         // Load appropriate bundle according to locale
-         propResBundle = (PropertyResourceBundle) ResourceBundle.getBundle(PATH,
-                           locale, Thread.currentThread().getContextClassLoader());
+        propResBundle = (PropertyResourceBundle) ResourceBundle.getBundle(PATH,
+                           locale, JdbcRowSetResourceBundle.class.getModule());
 
    }