opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -782,7 +782,8 @@ Attribute ocAttr = entry.getObjectClassAttribute(); try { entryToReturn.setObjectClasses(ocAttr.getValues()); if (ocAttr != null) entryToReturn.setObjectClasses(ocAttr.getValues()); } catch (DirectoryException e) {