Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Tue Jun 01 15:16:36 2010 +0100
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java	Mon Jun 14 11:28:53 2010 -0700
     1.3 @@ -75,7 +75,7 @@
     1.4          args[1] = (arg1 != null ? arg1.toString() : "null");
     1.5          args[2] = (arg2 != null ? arg2.toString() : "null");
     1.6  
     1.7 -        return java.text.MessageFormat.format(format, args);
     1.8 +        return java.text.MessageFormat.format(format, (Object[]) args);
     1.9      }
    1.10  
    1.11      private static boolean resourcesInitialized = false;

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Tue Jun 01 15:16:36 2010 +0100
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java	Mon Jun 14 11:28:53 2010 -0700
     2.3 @@ -350,7 +350,7 @@
     2.4  
     2.5          if (useToString) {
     2.6              try {
     2.7 -                cls.getDeclaredMethod( "toString", null ) ;
     2.8 +                cls.getDeclaredMethod( "toString", (Class[])null ) ;
     2.9                  return true ;
    2.10              } catch (Exception exc) {
    2.11                  return false ;

     3.1 --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Tue Jun 01 15:16:36 2010 +0100
     3.2 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java	Mon Jun 14 11:28:53 2010 -0700
     3.3 @@ -108,8 +108,8 @@
     3.4  
     3.5              try {
     3.6                  helperClass = Class.forName( helperName, true, loader ) ;
     3.7 -                Method idMethod = helperClass.getDeclaredMethod( "id", null ) ;
     3.8 -                setId( (String)idMethod.invoke( null, null ) ) ;
     3.9 +                Method idMethod = helperClass.getDeclaredMethod( "id", (Class[])null ) ;
    3.10 +                setId( (String)idMethod.invoke( null, (Object[])null ) ) ;
    3.11              } catch (Exception ex) {
    3.12                  throw wrapper.badHelperIdMethod( ex, helperName ) ;
    3.13              }

     4.1 --- a/src/share/classes/org/omg/CORBA/ORB.java	Tue Jun 01 15:16:36 2010 +0100
     4.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java	Mon Jun 14 11:28:53 2010 -0700
     4.3 @@ -589,7 +589,7 @@
     4.4                  this.getClass().getMethod("create_operation_list", argc);
     4.5  
     4.6              // OK, the method exists, so invoke it and be happy.
     4.7 -            Object[] argx = { oper };
     4.8 +            java.lang.Object[] argx = { oper };
     4.9              return (org.omg.CORBA.NVList)meth.invoke(this, argx);
    4.10          }
    4.11          catch( java.lang.reflect.InvocationTargetException exs ) {

     5.1 --- a/src/share/classes/sun/corba/Bridge.java	Tue Jun 01 15:16:36 2010 +0100
     5.2 +++ b/src/share/classes/sun/corba/Bridge.java	Mon Jun 14 11:28:53 2010 -0700
     5.3 @@ -187,7 +187,7 @@
     5.4          try {
     5.5              // Invoke the ObjectInputStream.latestUserDefinedLoader method
     5.6              return (ClassLoader)latestUserDefinedLoaderMethod.invoke(null,
     5.7 -                                                                     NO_ARGS);
     5.8 +                                                                     (Object[])NO_ARGS);
     5.9          } catch (InvocationTargetException ite) {
    5.10              Error err = new Error(
    5.11                  "sun.corba.Bridge.latestUserDefinedLoader: " + ite ) ;