opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/Entries.java
@@ -753,7 +753,14 @@ public static Entry unmodifiableEntry(final Entry entry) throws NullPointerException { return new UnmodifiableEntry(entry); if (entry instanceof UnmodifiableEntry) { return entry; } else { return new UnmodifiableEntry(entry); } }