Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E82697A7 for ; Fri, 18 Nov 2011 11:22:54 +0000 (UTC) Received: (qmail 60394 invoked by uid 500); 18 Nov 2011 11:22:54 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 60346 invoked by uid 500); 18 Nov 2011 11:22:54 -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 60339 invoked by uid 99); 18 Nov 2011 11:22:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 11:22:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 18 Nov 2011 11:22:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 76D0E2388B46 for ; Fri, 18 Nov 2011 11:22:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1203604 [8/8] - in /directory/apacheds/branches/apacheds-osgi: ./ all/ apache-felix/ component-hub/ component-hub/src/ component-hub/src/main/ component-hub/src/main/java/ component-hub/src/main/java/org/ component-hub/src/main/java/org/ap... Date: Fri, 18 Nov 2011 11:21:59 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111118112205.76D0E2388B46@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Propchange: directory/apacheds/branches/apacheds-osgi/service-osgi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 18 11:21:55 2011 @@ -6,5 +6,5 @@ /directory/apacheds/branches/apacheds-subtree/service-osgi:965203-965686 /directory/apacheds/branches/milestones/service-osgi:1072812-1075328 /directory/apacheds/branches/xdbm-refactoring/service-osgi:945827-946347 -/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348 +/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550 /directory/studio/trunk/service-osgi:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-osgi/test-framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 18 11:21:55 2011 @@ -9,5 +9,5 @@ /directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686 /directory/apacheds/branches/milestones/test-framework:1072812-1075328 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347 -/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348 +/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550 /directory/studio/trunk/test-framework:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-osgi/xdbm-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 18 11:21:55 2011 @@ -4,5 +4,5 @@ /directory/apacheds/branches/apacheds-jdbm/xdbm-partition:1160768-1164092 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765 /directory/apacheds/branches/milestones/xdbm-partition:1072812-1075328 -/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348 +/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550 /directory/studio/trunk/xdbm-partition:1067786-1067997 Modified: directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1203604&r1=1203603&r2=1203604&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original) +++ directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Fri Nov 18 11:21:55 2011 @@ -820,8 +820,8 @@ public abstract class AbstractBTreeParti */ public EntryFilteringCursor list( ListOperationContext listContext ) throws LdapException { - return new BaseEntryFilteringCursor( - new EntryCursorAdaptor( this, + return new BaseEntryFilteringCursor( + new EntryCursorAdaptor( this, list( getEntryId( listContext.getDn() ) ) ), listContext ); } @@ -870,7 +870,7 @@ public abstract class AbstractBTreeParti } catch ( LdapException le ) { - // TODO: SearchEngine.cursor() should only throw LdapException, then the exception handling here can be removed + // TODO: SearchEngine.cursor() should only throw LdapException, then the exception handling here can be removed throw le; } catch ( Exception e ) @@ -897,8 +897,8 @@ public abstract class AbstractBTreeParti Entry entry = lookup( id ); - // Remove all the attributes if the NO_ATTRIBUTE flag is set - if ( lookupContext.hasNoAttribute() ) + // Remove all the attributes if the NO_ATTRIBUTE flag is set and there is no requested attribute + if ( lookupContext.hasNoAttribute() && ( ( lookupContext.getAttrsId() == null ) || lookupContext.getAttrsId().size() == 0 ) ) { entry.clear(); @@ -918,7 +918,7 @@ public abstract class AbstractBTreeParti AttributeType attributeType = attribute.getAttributeType(); String oid = attributeType.getOid(); - if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS ) + if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS ) { if ( !lookupContext.getAttrsId().contains( oid ) ) { @@ -936,7 +936,7 @@ public abstract class AbstractBTreeParti { AttributeType attributeType = attribute.getAttributeType(); - if ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS ) + if ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS ) { entry.removeAttributes( attributeType ); } @@ -950,7 +950,7 @@ public abstract class AbstractBTreeParti { AttributeType attributeType = attribute.getAttributeType(); - if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS ) + if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS ) { entry.removeAttributes( attributeType ); } @@ -1481,7 +1481,7 @@ public abstract class AbstractBTreeParti } catch ( LdapException le ) { - // In case we get an LdapException, just rethrow it as is to + // In case we get an LdapException, just rethrow it as is to // avoid having it lost throw le; } @@ -1807,7 +1807,7 @@ public abstract class AbstractBTreeParti Entry entry = lookup( id ); - return entry != null; + return entry != null; } catch ( LdapException e ) { Propchange: directory/apacheds/branches/apacheds-osgi/xdbm-tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 18 11:21:55 2011 @@ -4,5 +4,5 @@ /directory/apacheds/branches/apacheds-jdbm/xdbm-tools:1160768-1164092 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765 /directory/apacheds/branches/milestones/xdbm-tools:1072812-1075328 -/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348 +/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550 /directory/studio/trunk/xdbm-tools:1067786-1067997