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 812A8105BF for ; Mon, 10 Mar 2014 05:27:16 +0000 (UTC) Received: (qmail 78468 invoked by uid 500); 10 Mar 2014 05:27:15 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78431 invoked by uid 500); 10 Mar 2014 05:27:11 -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 78422 invoked by uid 99); 10 Mar 2014 05:27:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2014 05:27:10 +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, 10 Mar 2014 05:27:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C0561238897A; Mon, 10 Mar 2014 05:26:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1575830 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Date: Mon, 10 Mar 2014 05:26:48 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140310052648.C0561238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Mon Mar 10 05:26:48 2014 New Revision: 1575830 URL: http://svn.apache.org/r1575830 Log: o ignore contextCSN while modifying entries (DIRSERVER-1963) o removed an unused import Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1575830&r1=1575829&r2=1575830&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Mon Mar 10 05:26:48 2014 @@ -22,7 +22,6 @@ package org.apache.directory.server.ldap import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -140,7 +139,8 @@ public class ReplicationConsumerImpl imp SchemaConstants.CREATE_TIMESTAMP_AT, SchemaConstants.CREATORS_NAME_AT, SchemaConstants.ENTRY_PARENT_ID_AT, - SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT + SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT, + SchemaConstants.CONTEXT_CSN_AT }; /** the cookie that was saved last time */