diff options
author | lana <none@none> | 2010-06-29 22:31:34 -0700 |
---|---|---|
committer | lana <none@none> | 2010-06-29 22:31:34 -0700 |
commit | 609e6ae48aa87c43985c4a4ba2dcaf98fe4e4430 (patch) | |
tree | d4c1068adfaa9b9b33b27c16e2db117e4d6fb6cf | |
parent | bc7feda0ce9afe2b90baa6173771706249aff4c7 (diff) | |
parent | 2b856457ebdfdd64c3ebc29192e6801ac46e062b (diff) |
Mergejdk7-b100
5 files changed, 6 insertions, 6 deletions
diff --git a/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java index 59fe275..9f23ebf 100644 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java @@ -75,7 +75,7 @@ public class CorbaResourceUtil { 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 --git a/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java index 340e550..aca7676 100644 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java @@ -350,7 +350,7 @@ public final class ObjectUtility { if (useToString) { try { - cls.getDeclaredMethod( "toString", null ) ; + cls.getDeclaredMethod( "toString", (Class[])null ) ; return true ; } catch (Exception exc) { return false ; diff --git a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java index 06c192c..6b9452e 100644 --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java @@ -108,8 +108,8 @@ public class ExceptionHandlerImpl implements ExceptionHandler 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 --git a/src/share/classes/org/omg/CORBA/ORB.java b/src/share/classes/org/omg/CORBA/ORB.java index 7f02de2..4c1737a 100644 --- a/src/share/classes/org/omg/CORBA/ORB.java +++ b/src/share/classes/org/omg/CORBA/ORB.java @@ -589,7 +589,7 @@ abstract public class ORB { 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 --git a/src/share/classes/sun/corba/Bridge.java b/src/share/classes/sun/corba/Bridge.java index e71eb94..e7ab067 100644 --- a/src/share/classes/sun/corba/Bridge.java +++ b/src/share/classes/sun/corba/Bridge.java @@ -187,7 +187,7 @@ public final class Bridge 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 ) ; |