Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 88937 invoked from network); 24 Sep 2009 15:16:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 15:16:38 -0000 Received: (qmail 57020 invoked by uid 500); 24 Sep 2009 15:16:38 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56957 invoked by uid 500); 24 Sep 2009 15:16:38 -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 56945 invoked by uid 99); 24 Sep 2009 15:16:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 15:16:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 24 Sep 2009 15:16:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 451AD2388904; Thu, 24 Sep 2009 15:16:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818512 - in /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core: event/EventInterceptor.java operational/OperationalAttributeInterceptor.java Date: Thu, 24 Sep 2009 15:16:16 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924151616.451AD2388904@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Sep 24 15:16:13 2009 New Revision: 818512 URL: http://svn.apache.org/viewvc?rev=818512&view=rev Log: Fixed 4 failures : the modify operation was not updating the modified entry, but the previous one, when updating the operational attributes, in some cases. That led to a revival of the previous values... Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=818512&r1=818511&r2=818512&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Thu Sep 24 15:16:13 2009 @@ -219,7 +219,7 @@ return; } - opContext.setAlteredEntry( opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS ) ); + //opContext.setAlteredEntry( opContext.lookup( opContext.getNewDn(), ByPassConstants.LOOKUP_BYPASS ) ); for ( final RegistrationEntry registration : selecting ) { Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=818512&r1=818511&r2=818512&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Thu Sep 24 15:16:13 2009 @@ -246,7 +246,7 @@ // ------------------------------------------------------------------- ModifyOperationContext newModify = new ModifyOperationContext( opContext.getSession(), opContext.getDn(), modItemList ); - newModify.setEntry( opContext.getEntry() ); + newModify.setEntry( opContext.getAlteredEntry() ); service.getPartitionNexus().modify( newModify ); }