It seems that the line endings were broken in the attachment, so I'm
going to resend the patch in-line.
-Sasha
----------------------------------------------
diff -r 18329abcdb7c src/share/classes/com/sun/jndi/ldap/Obj.java
--- a/src/share/classes/com/sun/jndi/ldap/Obj.java Wed Aug 10
13:44:58 2011 -0700
+++ b/src/share/classes/com/sun/jndi/ldap/Obj.java Thu Aug 11
12:02: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) {
diff -r 18329abcdb7c
src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
--- a/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
Wed Aug 10 13:44:58 2011 -0700
+++ b/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
Thu Aug 11 12:02: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)");
On 8/11/2011 12:07 PM, Alexandre Boulgakov wrote:
Please review the attached patch to fix a build break.
The fix changes new Class<>[] to new Class<?>[] in two places.
Thanks,
Sasha
