Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 97956 invoked from network); 26 Sep 2008 16:12:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Sep 2008 16:12:04 -0000 Received: (qmail 72382 invoked by uid 500); 26 Sep 2008 16:11:57 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 72352 invoked by uid 500); 26 Sep 2008 16:11:57 -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 72337 invoked by uid 99); 26 Sep 2008 16:11:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Sep 2008 09:11:56 -0700 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; Fri, 26 Sep 2008 16:11:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A082823889FC; Fri, 26 Sep 2008 09:11:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r699392 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Date: Fri, 26 Sep 2008 16:11:37 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080926161137.A082823889FC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri Sep 26 09:11:37 2008 New Revision: 699392 URL: http://svn.apache.org/viewvc?rev=699392&view=rev Log: JCR-1771 Avoid unnecessary roundtrips with NodeEntry.getPropertyEntry Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=699392&r1=699391&r2=699392&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Fri Sep 26 09:11:37 2008 @@ -662,18 +662,13 @@ } /** - * @inheritDoc + * Ignores the loadIfNotFound flag due to the fact, that + * {@link org.apache.jackrabbit.spi.NodeInfo#getPropertyIds()} returns the + * complete list of property names currently available. * @see NodeEntry#getPropertyEntry(Name, boolean) */ public PropertyEntry getPropertyEntry(Name propName, boolean loadIfNotFound) throws RepositoryException { - PropertyEntry entry = properties.get(propName); - if (entry == null && loadIfNotFound && Status.NEW != getStatus()) { - PropertyId propId = factory.getIdFactory().createPropertyId(getId(), propName); - entry = loadPropertyEntry(propId); - } else if (!EntryValidation.isValidPropertyEntry(entry)) { - entry = null; - } - return entry; + return getPropertyEntry(propName); } /**