--- a/jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java	Tue May 03 15:50:54 2016 +0200
+++ b/jdk/src/java.naming/share/classes/javax/naming/spi/NamingManager.java	Tue May 03 10:40:54 2016 -0700
@@ -159,7 +159,9 @@
             }
         }
 
-        return (clas != null) ? (ObjectFactory) clas.newInstance() : null;
+        @SuppressWarnings("deprecation") // Class.newInstance
+        ObjectFactory result = (clas != null) ? (ObjectFactory) clas.newInstance() : null;
+        return result;
     }
 
 
@@ -710,8 +712,9 @@
 
             if (factory == null) {
                 try {
-                    factory = (InitialContextFactory)
-                            helper.loadClass(className).newInstance();
+                    @SuppressWarnings("deprecation")
+                    Object o = helper.loadClass(className).newInstance();
+                    factory = (InitialContextFactory) o;
                 } catch (Exception e) {
                     NoInitialContextException ne =
                             new NoInitialContextException(