Mercurial > hg > openjdk > jdk6 > corba
changeset 48:836643e8a67d jdk6-b20
Merge
| author | ohair |
|---|---|
| date | Mon, 14 Jun 2010 16:59:25 -0700 |
| parents | ad444d14e3d5 (current diff) e4fa089433a7 (diff) |
| children | 01863f27b876 |
| files | |
| diffstat | 6 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-java.gmk Mon Jun 14 16:53:21 2010 -0700 +++ b/make/common/shared/Defs-java.gmk Mon Jun 14 16:59:25 2010 -0700 @@ -104,6 +104,9 @@ JAVACFLAGS += -Werror endif +NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true +JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) + # Add the source level (currently all source is 1.5, should this be 1.6?) LANGUAGE_VERSION = -source 1.5 JAVACFLAGS += $(LANGUAGE_VERSION)
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Mon Jun 14 16:53:21 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Mon Jun 14 16:59:25 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/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Mon Jun 14 16:53:21 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Mon Jun 14 16:59:25 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/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Mon Jun 14 16:53:21 2010 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Mon Jun 14 16:59:25 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/src/share/classes/org/omg/CORBA/ORB.java Mon Jun 14 16:53:21 2010 -0700 +++ b/src/share/classes/org/omg/CORBA/ORB.java Mon Jun 14 16:59:25 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/src/share/classes/sun/corba/Bridge.java Mon Jun 14 16:53:21 2010 -0700 +++ b/src/share/classes/sun/corba/Bridge.java Mon Jun 14 16:59:25 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 ) ;