--- old/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template	2016-04-21 08:39:11.876036724 -0700
+++ new/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template	2016-04-21 08:39:11.716116721 -0700
@@ -110,10 +110,11 @@
 
         // Instantiate the charset and cache it
         try {
-            Class<?> c = Class.forName(packagePrefix + "." + cln,
-                                    true,
-                                    this.getClass().getClassLoader());
-            cs = (Charset)c.newInstance();
+            @SuppressWarnings("deprecation")
+            Object o = Class.forName(packagePrefix + "." + cln,
+                                     true,
+                                     this.getClass().getClassLoader()).newInstance();
+            cs = (Charset)o;
             cache.put(csn, cs);
             return cs;
         } catch (ClassNotFoundException |