--- a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java Fri Mar 02 17:24:08 2012 +0000
+++ b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java Fri Mar 02 13:48:43 2012 -0800
@@ -65,14 +65,14 @@
/** table to hold sun classes to which access is explicitly permitted */
protected static Map<String, Class<?>> permittedSunClasses
- = new HashMap<String, Class<?>>(3);
+ = new HashMap<>(3);
/** if true, don't try superclass first in resolveClass() */
private boolean skipDefaultResolveClass = false;
/** callbacks to make when done() called: maps Object to Runnable */
private final Map<Object, Runnable> doneCallbacks
- = new HashMap<Object, Runnable>(3);
+ = new HashMap<>(3);
/**
* if true, load classes (if not available locally) only from the
@@ -168,7 +168,7 @@
* from which to load the specified class.
* It will find, load, and return the class.
*/
- protected Class resolveClass(ObjectStreamClass classDesc)
+ protected Class<?> resolveClass(ObjectStreamClass classDesc)
throws IOException, ClassNotFoundException
{
/*
@@ -230,7 +230,7 @@
* resolveProxyClass is extended to acquire (if present) the location
* to determine the class loader to define the proxy class in.
*/
- protected Class resolveProxyClass(String[] interfaces)
+ protected Class<?> resolveProxyClass(String[] interfaces)
throws IOException, ClassNotFoundException
{
/*
@@ -262,7 +262,7 @@
* Fix for 4179055: Need to assist resolving sun stubs; resolve
* class locally if it is a "permitted" sun class
*/
- private Class checkSunClass(String className, AccessControlException e)
+ private Class<?> checkSunClass(String className, AccessControlException e)
throws AccessControlException
{
// ensure that we are giving out a stub for the correct reason