changeset 183:3f451af3b414

merge with jdk7-b101
author mcimadamore
date Fri, 23 Jul 2010 13:58:52 +0100
parents 9b37a680fcae 78561a957790
children 8b33289e29e9
files
diffstat 6 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 28 09:11:52 2010 +0100
+++ b/.hgtags	Fri Jul 23 13:58:52 2010 +0100
@@ -74,3 +74,5 @@
 4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97
 3b99409057e4c255da946f9f540d051a5ef4ab23 jdk7-b98
 95db968660e7d87c345d5cf3dc2e3db037fb7220 jdk7-b99
+a56d734a1e970e1a21a8f4feb13053e9a33674c7 jdk7-b100
+86a239832646a74811695428984b6947c0bd6dc8 jdk7-b101
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Mon Jun 28 09:11:52 2010 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Fri Jul 23 13:58:52 2010 +0100
@@ -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/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Mon Jun 28 09:11:52 2010 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Fri Jul 23 13:58:52 2010 +0100
@@ -350,7 +350,7 @@
 
         if (useToString) {
             try {
-                cls.getDeclaredMethod( "toString", null ) ;
+                cls.getDeclaredMethod( "toString", (Class[])null ) ;
                 return true ;
             } catch (Exception exc) {
                 return false ;
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Mon Jun 28 09:11:52 2010 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Fri Jul 23 13:58:52 2010 +0100
@@ -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/src/share/classes/org/omg/CORBA/ORB.java	Mon Jun 28 09:11:52 2010 +0100
+++ b/src/share/classes/org/omg/CORBA/ORB.java	Fri Jul 23 13:58:52 2010 +0100
@@ -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/src/share/classes/sun/corba/Bridge.java	Mon Jun 28 09:11:52 2010 +0100
+++ b/src/share/classes/sun/corba/Bridge.java	Fri Jul 23 13:58:52 2010 +0100
@@ -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 ) ;