OpenJDK / amber / amber
changeset 10326:9feeb910a1e2
7077672: jdk8_tl nightly fail in step-2 build on 8/10/11
Reviewed-by: mchung, jjg
Contributed-by: alexandre.boulgakov@oracle.com
| author | jjg |
|---|---|
| date | Thu, 11 Aug 2011 13:34:25 -0700 |
| parents | b72c20cd583a |
| children | 37a3f951eb3a |
| files | jdk/src/share/classes/com/sun/jndi/ldap/Obj.java jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java Thu Aug 11 12:40:24 2011 +0100 +++ b/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java Thu Aug 11 13:34:25 2011 -0700 @@ -628,7 +628,7 @@ boolean hasNonPublicInterface = false; // define proxy in class loader of non-public interface(s), if any - Class<?>[] classObjs = new Class<>[interfaces.length]; + Class<?>[] classObjs = new Class<?>[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { Class<?> cl = Class.forName(interfaces[i], false, classLoader); if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
--- a/jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java Thu Aug 11 12:40:24 2011 +0100 +++ b/jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java Thu Aug 11 13:34:25 2011 -0700 @@ -252,7 +252,7 @@ try { connectMethod = corbaStubClass.getMethod("connect", - new Class<>[] {org.omg.CORBA.ORB.class}); + new Class<?>[] {org.omg.CORBA.ORB.class}); } catch (NoSuchMethodException e) { throw new IllegalStateException( "No method definition for javax.rmi.CORBA.Stub.connect(org.omg.CORBA.ORB)");