From commits-return-20645-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Dec 03 20:12:20 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 32823 invoked from network); 3 Dec 2008 20:12:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Dec 2008 20:12:18 -0000 Received: (qmail 46093 invoked by uid 500); 3 Dec 2008 20:12:29 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 46049 invoked by uid 500); 3 Dec 2008 20:12:29 -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 46040 invoked by uid 99); 3 Dec 2008 20:12:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 12:12:29 -0800 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; Wed, 03 Dec 2008 20:11:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3EA8823888EB; Wed, 3 Dec 2008 12:11:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r723055 - in /directory/apacheds/branches/apacheds-mina2/mitosis/src: main/java/org/apache/directory/mitosis/service/ main/java/org/apache/directory/mitosis/service/protocol/handler/ test/java/org/apache/directory/mitosis/service/protocol/c... Date: Wed, 03 Dec 2008 20:11:26 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081203201127.3EA8823888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Dec 3 12:11:26 2008 New Revision: 723055 URL: http://svn.apache.org/viewvc?rev=723055&view=rev Log: Replaced tabs by 4 spaces. Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=723055&r1=723054&r2=723055&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Wed Dec 3 12:11:26 2008 @@ -382,7 +382,7 @@ { while ( cursor.next() ) { - ServerEntry entry = cursor.get(); + ServerEntry entry = cursor.get(); LdapDN name = entry.getDn(); if ( name.size() > contextName.size() ) @@ -524,14 +524,14 @@ @Override public EntryFilteringCursor list( NextInterceptor nextInterceptor, ListOperationContext opContext ) throws Exception { - EntryFilteringCursor cursor = nextInterceptor.search( - new SearchOperationContext( - opContext.getSession(), opContext.getDn(), opContext.getAliasDerefMode(), - new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), - new SearchControls() ) ); + EntryFilteringCursor cursor = nextInterceptor.search( + new SearchOperationContext( + opContext.getSession(), opContext.getDn(), opContext.getAliasDerefMode(), + new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), + new SearchControls() ) ); - cursor.addEntryFilter( Constants.DELETED_ENTRIES_FILTER ); - return cursor; + cursor.addEntryFilter( Constants.DELETED_ENTRIES_FILTER ); + return cursor; } @@ -550,10 +550,10 @@ searchControls.setReturningAttributes( newAttrIds ); } - EntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( opContext.getSession(), - opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(), searchControls ) ); - cursor.addEntryFilter( Constants.DELETED_ENTRIES_FILTER ); - return cursor; + EntryFilteringCursor cursor = nextInterceptor.search( new SearchOperationContext( opContext.getSession(), + opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(), searchControls ) ); + cursor.addEntryFilter( Constants.DELETED_ENTRIES_FILTER ); + return cursor; } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java?rev=723055&r1=723054&r2=723055&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java Wed Dec 3 12:11:26 2008 @@ -196,7 +196,7 @@ try { op.execute( ctx.getDirectoryService().getPartitionNexus(), ctx.getConfiguration().getStore(), - ctx.getDirectoryService().getSession() ); + ctx.getDirectoryService().getSession() ); ack = new LogEntryAckMessage( message.getSequence(), Constants.OK ); } Modified: directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java?rev=723055&r1=723054&r2=723055&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java (original) +++ directory/apacheds/branches/apacheds-mina2/mitosis/src/test/java/org/apache/directory/mitosis/service/protocol/codec/AbstractMessageCodecTest.java Wed Dec 3 12:11:26 2008 @@ -162,9 +162,10 @@ } - public WriteFuture write(Object message) { - this.message = message; - return null; + public WriteFuture write(Object message) + { + this.message = message; + return null; } } }