Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 74052 invoked from network); 17 Feb 2010 16:16:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Feb 2010 16:16:08 -0000 Received: (qmail 71762 invoked by uid 500); 17 Feb 2010 16:16:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 71702 invoked by uid 500); 17 Feb 2010 16:16:07 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 71693 invoked by uid 99); 17 Feb 2010 16:16:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Feb 2010 16:16:07 +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; Wed, 17 Feb 2010 16:16:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02A6B23889C5; Wed, 17 Feb 2010 16:15:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911050 - /jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java Date: Wed, 17 Feb 2010 16:15:43 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100217161544.02A6B23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Feb 17 16:15:43 2010 New Revision: 911050 URL: http://svn.apache.org/viewvc?rev=911050&view=rev Log: JCR-2500: spi2davex NodeInfoImpl should use HashSet instead of ArrayList for childInfos Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java?rev=911050&r1=911049&r2=911050&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java (original) +++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java Wed Feb 17 16:15:43 2010 @@ -16,6 +16,15 @@ */ package org.apache.jackrabbit.spi2davex; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.jcr.RepositoryException; + import org.apache.jackrabbit.spi.ChildInfo; import org.apache.jackrabbit.spi.IdFactory; import org.apache.jackrabbit.spi.Name; @@ -29,14 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jcr.RepositoryException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.Collections; - /** * NodeInfoImpl... */ @@ -50,9 +51,9 @@ private Name[] mixinNodeTypeNames = new Name[0]; private final Set propertyInfos = new HashSet(); - private List childInfos = null; + private Set childInfos = null; - private int numberOfChildNodes = -1; + private final int numberOfChildNodes = -1; /** * Creates a new NodeInfo. @@ -123,18 +124,14 @@ void addChildInfo(ChildInfo childInfo) { if (childInfos == null) { - childInfos = new ArrayList(); - } - if (childInfos.contains(childInfo)) { - log.warn("ChildInfo ( " + childInfo.toString() + " ) already contained -> ignore."); - } else { - childInfos.add(childInfo); + childInfos = new HashSet(); } + childInfos.add(childInfo); } void setNumberOfChildNodes(long numberOfChildNodes) { if (numberOfChildNodes == 0) { - childInfos = Collections.EMPTY_LIST; + childInfos = Collections.emptySet(); } // else: wait for calls to #addChildInfo }