Entry.getAttributes() never return null

Jean-Noël Rouvignac

16.54.2015 23de2bc1524fe169fcca2c4a39201db78f6c6b9a

 opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java

@@ -560,18 +560,12 @@

        final SearchResultEntry searchResultEntry =
                Responses.newSearchResultEntry(srvResultEntry.getName().toString());
        if (srvResultEntry.getAttributes() != null) {
            for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
                searchResultEntry.addAttribute(from(a));
            }
        for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
            searchResultEntry.addAttribute(from(a));
        }

        if (srvResultEntry.getControls() != null) {
            for (org.opends.server.types.Control c : srvResultEntry.getControls()) {
                searchResultEntry.addControl(from(c));
            }
        for (org.opends.server.types.Control c : srvResultEntry.getControls()) {
            searchResultEntry.addControl(from(c));
        }

        return searchResultEntry;
    }

@@ -588,10 +582,8 @@
        final org.opends.server.types.Entry srvResultEntry) {

        final org.forgerock.opendj.ldap.Entry entry = new LinkedHashMapEntry(srvResultEntry.getName().toString());
        if (srvResultEntry.getAttributes() != null) {
            for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
                entry.addAttribute(from(a));
            }
        for (org.opends.server.types.Attribute a : srvResultEntry.getAttributes()) {
            entry.addAttribute(from(a));
        }
        return entry;
    }