From commits-return-31958-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Jun 20 07:43:38 2011 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 062ED6898 for ; Mon, 20 Jun 2011 07:43:38 +0000 (UTC) Received: (qmail 71520 invoked by uid 500); 20 Jun 2011 07:43:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 71460 invoked by uid 500); 20 Jun 2011 07:43:37 -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 71452 invoked by uid 99); 20 Jun 2011 07:43:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 07:43:37 +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; Mon, 20 Jun 2011 07:43:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1984923889EC; Mon, 20 Jun 2011 07:43:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1137534 - /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Date: Mon, 20 Jun 2011 07:43:16 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110620074316.1984923889EC@eris.apache.org> Author: elecharny Date: Mon Jun 20 07:43:15 2011 New Revision: 1137534 URL: http://svn.apache.org/viewvc?rev=1137534&view=rev Log: Fixed a compilation error due to the removal of ClonedServerEntry Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1137534&r1=1137533&r2=1137534&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Mon Jun 20 07:43:15 2011 @@ -25,15 +25,16 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.core.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.partition.Partition; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; +import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.DefaultAttribute; import org.apache.directory.shared.ldap.model.entry.DefaultModification; import org.apache.directory.shared.ldap.model.entry.Entry; -import org.apache.directory.shared.ldap.model.entry.Attribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.ModificationOperation; import org.apache.directory.shared.ldap.model.entry.Value; @@ -223,9 +224,10 @@ public class PartitionsDiffComputer // Looking for the children of the current entry EntryFilteringCursor cursor = originalPartition.search( soc ); + while ( cursor.next() ) { - originalEntries.add( cursor.get().getClonedEntry() ); + originalEntries.add( ((ClonedServerEntry)cursor.get()).getClonedEntry() ); } } }