Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 61381 invoked from network); 8 May 2010 08:53:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 May 2010 08:53:21 -0000 Received: (qmail 69167 invoked by uid 500); 8 May 2010 08:53:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69108 invoked by uid 500); 8 May 2010 08:53:20 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 69101 invoked by uid 99); 8 May 2010 08:53:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 May 2010 08:53:20 +0000 X-ASF-Spam-Status: No, hits=-1375.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 May 2010 08:53:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFF0123889BF; Sat, 8 May 2010 08:52:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r942348 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Date: Sat, 08 May 2010 08:52:22 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100508085222.EFF0123889BF@eris.apache.org> Author: elecharny Date: Sat May 8 08:52:22 2010 New Revision: 942348 URL: http://svn.apache.org/viewvc?rev=942348&view=rev Log: Removed the filterObjectClass() method, as it's not called anymore. It was used to add the missing OC when returning an entry, but as those OC are added when the entry is added into the server, it's useless and time consuming. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=942348&r1=942347&r2=942348&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat May 8 08:52:22 2010 @@ -1456,30 +1456,6 @@ public class SchemaInterceptor extends B } - private void filterObjectClass( Entry entry ) throws Exception - { - List objectClasses = new ArrayList(); - EntryAttribute oc = entry.get( SchemaConstants.OBJECT_CLASS_AT ); - - if ( oc != null ) - { - getObjectClasses( oc, objectClasses ); - - entry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT ); - - EntryAttribute newOc = new DefaultEntryAttribute( oc.getAttributeType() ); - - for ( ObjectClass currentOC : objectClasses ) - { - newOc.add( currentOC.getName() ); - } - - newOc.add( SchemaConstants.TOP_OC ); - entry.put( newOc ); - } - } - - private void filterBinaryAttributes( Entry entry ) throws Exception { /* @@ -1533,7 +1509,6 @@ public class SchemaInterceptor extends B { public boolean accept( SearchingOperationContext operation, ClonedServerEntry result ) throws Exception { - filterObjectClass( result ); filterAttributeTypes( operation, result ); return true; }