Fix JDK6 compilation error as a result of fix for OPENDJ-185 : Add support ...

Matthew Swift

05.50.2012 4d2a16a13a886f148155bbb54f90a17188d524ef

Fix JDK6 compilation error as a result of fix for OPENDJ-185 : Add support for controls in SDK LDIFReader

JDK6 compiler has a big which prevents it from successfully compiling interfaces which combine multiple inheritance and covariant return types.

See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6970851

 opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java

@@ -29,7 +29,6 @@

import java.util.List;

import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.DecodeOptions;
@@ -72,6 +71,15 @@
     */
    DN getName();


    /*
     * Uncomment both setName methods when we require JDK7 since JDK6 fails
     * cannot deal with multiple inheritance of covariant return types
     * (AddRequest inherits from both ChangeRecord and Entry).
     *
     * See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6970851
     */

    /**
     * Sets the distinguished name of the entry to be updated. The server shall
     * not perform any alias dereferencing in determining the object to be
@@ -86,7 +94,7 @@
     * @throws NullPointerException
     *             If {@code dn} was {@code null}.
     */
    ChangeRecord setName(DN dn);
    // ChangeRecord setName(DN dn);

    /**
     * Sets the distinguished name of the entry to be updated. The server shall
@@ -104,7 +112,7 @@
     * @throws NullPointerException
     *             If {@code dn} was {@code null}.
     */
    ChangeRecord setName(String dn);
    // ChangeRecord setName(String dn);

    /**
     * {@inheritDoc}