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 3A81C11300 for ; Mon, 21 Apr 2014 10:53:03 +0000 (UTC) Received: (qmail 93059 invoked by uid 500); 21 Apr 2014 10:53:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 93031 invoked by uid 500); 21 Apr 2014 10:53:02 -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 93024 invoked by uid 99); 21 Apr 2014 10:53:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Apr 2014 10:53:01 +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, 21 Apr 2014 10:53:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 86D202388993; Mon, 21 Apr 2014 10:52:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1588867 - /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java Date: Mon, 21 Apr 2014 10:52:38 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140421105238.86D202388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Apr 21 10:52:38 2014 New Revision: 1588867 URL: http://svn.apache.org/r1588867 Log: o Fixed the toString() method not to be dependent on the Map ordering. o Removed a warning Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java?rev=1588867&r1=1588866&r2=1588867&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java Mon Apr 21 10:52:38 2014 @@ -387,10 +387,26 @@ public final class DefaultEntry implemen .err( I18n.ERR_12087 ) ); } - LdifAttributesReader reader = new LdifAttributesReader(); - Entry entry = reader.parseEntry( schemaManager, sb.toString() ); - - return entry; + LdifAttributesReader reader = null; + + try + { + reader = new LdifAttributesReader(); + Entry entry = reader.parseEntry( schemaManager, sb.toString() ); + + return entry; + } + finally + { + try + { + reader.close(); + } + catch ( IOException e ) + { + e.printStackTrace(); + } + } } @@ -2614,7 +2630,7 @@ public final class DefaultEntry implemen } sb.append( '\n' ); - + if ( attributes.size() != 0 ) { boolean isFirst = true; @@ -2625,10 +2641,6 @@ public final class DefaultEntry implemen { isFirst = false; } - else - { - sb.append( '\n' ); - } String id = attribute.getId(); @@ -2652,6 +2664,7 @@ public final class DefaultEntry implemen && !id.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) ) { sb.append( attribute.toString( tabs + " " ) ); + sb.append( '\n' ); continue; } }