From commits-return-24969-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Mar 02 17:52:19 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 4379 invoked from network); 2 Mar 2010 17:52:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Mar 2010 17:52:18 -0000 Received: (qmail 23045 invoked by uid 500); 2 Mar 2010 17:52:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 23003 invoked by uid 500); 2 Mar 2010 17:52:14 -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 22996 invoked by uid 99); 2 Mar 2010 17:52:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 17:52:13 +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, 02 Mar 2010 17:52:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E15723889E5; Tue, 2 Mar 2010 17:51:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918128 - in /directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif: LdifReader.java LdifUtils.java Date: Tue, 02 Mar 2010 17:51:51 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100302175151.0E15723889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Mar 2 17:51:50 2010 New Revision: 918128 URL: http://svn.apache.org/viewvc?rev=918128&view=rev Log: Fixed the generated LDIF which were containing a changeType: add in the schema Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=918128&r1=918127&r2=918128&view=diff ============================================================================== --- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original) +++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Tue Mar 2 17:51:50 2010 @@ -1885,4 +1885,5 @@ reader.close(); } } -} \ No newline at end of file +} + Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=918128&r1=918127&r2=918128&view=diff ============================================================================== --- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original) +++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Tue Mar 2 17:51:50 2010 @@ -320,9 +320,12 @@ // Dump the ChangeType String changeType = entry.getChangeType().toString().toLowerCase(); - sb.append( stripLineToNChars( "changetype: " + changeType, length ) ); - sb.append( '\n' ); + if ( entry.getChangeType() != ChangeType.Modify ) + { + sb.append( stripLineToNChars( "changetype: " + changeType, length ) ); + sb.append( '\n' ); + } switch ( entry.getChangeType() ) {