Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 87913 invoked from network); 10 Apr 2007 13:03:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Apr 2007 13:03:38 -0000 Received: (qmail 80181 invoked by uid 500); 10 Apr 2007 13:03:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 80150 invoked by uid 500); 10 Apr 2007 13:03:41 -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 80139 invoked by uid 99); 10 Apr 2007 13:03:41 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 06:03:41 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 06:03:34 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E05FA1A9838; Tue, 10 Apr 2007 06:03:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r527122 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Date: Tue, 10 Apr 2007 13:03:14 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070410130314.E05FA1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Apr 10 06:03:13 2007 New Revision: 527122 URL: http://svn.apache.org/viewvc?view=rev&rev=527122 Log: Updated the compare method to use a ServiceContext Cleaned some code Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?view=diff&rev=527122&r1=527121&r2=527122 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Tue Apr 10 06:03:13 2007 @@ -31,6 +31,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.authn.LdapPrincipal; +import org.apache.directory.server.core.interceptor.context.CompareServiceContext; import org.apache.directory.server.core.interceptor.context.UnbindServiceContext; import org.apache.directory.server.core.referral.ReferralService; import org.apache.directory.shared.ldap.NotImplementedException; @@ -164,7 +165,7 @@ */ public boolean compare( LdapDN name, String oid, Object value ) throws NamingException { - return super.getNexusProxy().compare( name, oid, value ); + return super.getNexusProxy().compare( new CompareServiceContext( name, oid, value ) ); } @@ -179,9 +180,8 @@ public void ldapUnbind() throws NamingException { String bindDn = ( String ) getEnvironment().get( Context.SECURITY_PRINCIPAL ); - UnbindServiceContext unbindContext = new UnbindServiceContext( new LdapDN( bindDn ) ); - super.getNexusProxy().unbind( unbindContext ); + super.getNexusProxy().unbind( new UnbindServiceContext( new LdapDN( bindDn ) ) ); }