From commits-return-25773-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue May 11 20:25:31 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35128 invoked from network); 11 May 2010 20:25:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 May 2010 20:25:31 -0000 Received: (qmail 47454 invoked by uid 500); 11 May 2010 20:25:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 47394 invoked by uid 500); 11 May 2010 20:25:31 -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 47387 invoked by uid 99); 11 May 2010 20:25:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 May 2010 20:25:31 +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; Tue, 11 May 2010 20:25:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 656A623889C5; Tue, 11 May 2010 20:25:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r943270 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Date: Tue, 11 May 2010 20:25:08 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100511202508.656A623889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Tue May 11 20:25:08 2010 New Revision: 943270 URL: http://svn.apache.org/viewvc?rev=943270&view=rev Log: fix for DIRSERVER-1502 Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=943270&r1=943269&r2=943270&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Tue May 11 20:25:08 2010 @@ -303,9 +303,15 @@ public class EventInterceptor extends Ba { NotificationCriteria criteria = registration.getCriteria(); - if ( evaluator.evaluate( criteria.getFilter(), criteria.getBase(), entry ) ) + DN base = criteria.getBase(); + + // fix for DIRSERVER-1502 + if( name.equals( base ) || name.isChildOf( base ) ) { - selecting.add( registration ); + if ( evaluator.evaluate( criteria.getFilter(), base, entry ) ) + { + selecting.add( registration ); + } } }