--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Tue Jun 01 15:16:36 2010 +0100
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Mon Jun 14 11:28:53 2010 -0700
@@ -75,7 +75,7 @@
args[1] = (arg1 != null ? arg1.toString() : "null");
args[2] = (arg2 != null ? arg2.toString() : "null");
- return java.text.MessageFormat.format(format, args);
+ return java.text.MessageFormat.format(format, (Object[]) args);
}
private static boolean resourcesInitialized = false;
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Tue Jun 01 15:16:36 2010 +0100
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Mon Jun 14 11:28:53 2010 -0700
@@ -350,7 +350,7 @@
if (useToString) {
try {
- cls.getDeclaredMethod( "toString", null ) ;
+ cls.getDeclaredMethod( "toString", (Class[])null ) ;
return true ;
} catch (Exception exc) {
return false ;
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Tue Jun 01 15:16:36 2010 +0100
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Mon Jun 14 11:28:53 2010 -0700
@@ -108,8 +108,8 @@
try {
helperClass = Class.forName( helperName, true, loader ) ;
- Method idMethod = helperClass.getDeclaredMethod( "id", null ) ;
- setId( (String)idMethod.invoke( null, null ) ) ;
+ Method idMethod = helperClass.getDeclaredMethod( "id", (Class[])null ) ;
+ setId( (String)idMethod.invoke( null, (Object[])null ) ) ;
} catch (Exception ex) {
throw wrapper.badHelperIdMethod( ex, helperName ) ;
}
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java Tue Jun 01 15:16:36 2010 +0100
+++ b/corba/src/share/classes/org/omg/CORBA/ORB.java Mon Jun 14 11:28:53 2010 -0700
@@ -589,7 +589,7 @@
this.getClass().getMethod("create_operation_list", argc);
// OK, the method exists, so invoke it and be happy.
- Object[] argx = { oper };
+ java.lang.Object[] argx = { oper };
return (org.omg.CORBA.NVList)meth.invoke(this, argx);
}
catch( java.lang.reflect.InvocationTargetException exs ) {
--- a/corba/src/share/classes/sun/corba/Bridge.java Tue Jun 01 15:16:36 2010 +0100
+++ b/corba/src/share/classes/sun/corba/Bridge.java Mon Jun 14 11:28:53 2010 -0700
@@ -187,7 +187,7 @@
try {
// Invoke the ObjectInputStream.latestUserDefinedLoader method
return (ClassLoader)latestUserDefinedLoaderMethod.invoke(null,
- NO_ARGS);
+ (Object[])NO_ARGS);
} catch (InvocationTargetException ite) {
Error err = new Error(
"sun.corba.Bridge.latestUserDefinedLoader: " + ite ) ;