# HG changeset patch
# User lana
# Date 1277875894 25200
# Node ID f037d51a0c873a325f1437cd64803b8de7383342
# Parent  55d246be61c5de807ea78c0d91fe22fa8647d1b5# Parent  4afda5cf7fc38d8fa80714678f9b0c9a08358a42
Merge

diff -r 55d246be61c5 -r f037d51a0c87 corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Thu Jun 24 20:02:56 2010 -0700
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Tue Jun 29 22:31:34 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;
diff -r 55d246be61c5 -r f037d51a0c87 corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Thu Jun 24 20:02:56 2010 -0700
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Tue Jun 29 22:31:34 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 ;
diff -r 55d246be61c5 -r f037d51a0c87 corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Thu Jun 24 20:02:56 2010 -0700
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Tue Jun 29 22:31:34 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 ) ;
             }
diff -r 55d246be61c5 -r f037d51a0c87 corba/src/share/classes/org/omg/CORBA/ORB.java
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java	Thu Jun 24 20:02:56 2010 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/ORB.java	Tue Jun 29 22:31:34 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 ) {
diff -r 55d246be61c5 -r f037d51a0c87 corba/src/share/classes/sun/corba/Bridge.java
--- a/corba/src/share/classes/sun/corba/Bridge.java	Thu Jun 24 20:02:56 2010 -0700
+++ b/corba/src/share/classes/sun/corba/Bridge.java	Tue Jun 29 22:31:34 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 ) ;