From 4d2a16a13a886f148155bbb54f90a17188d524ef Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 05 Oct 2012 19:50:52 +0000
Subject: [PATCH] Fix JDK6 compilation error as a result of fix for OPENDJ-185 : Add support for controls in SDK LDIFReader
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java
index 95554e7..dd65dda 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java
+++ b/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}
--
Gitblit v1.10.0