Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0A909A05 for ; Wed, 4 Apr 2012 09:46:30 +0000 (UTC) Received: (qmail 28373 invoked by uid 500); 4 Apr 2012 09:46:30 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 28348 invoked by uid 500); 4 Apr 2012 09:46:30 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 28332 invoked by uid 99); 4 Apr 2012 09:46:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2012 09:46:30 +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; Wed, 04 Apr 2012 09:46:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA644238899C; Wed, 4 Apr 2012 09:46:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1309305 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java Date: Wed, 04 Apr 2012 09:46:08 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120404094608.EA644238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Apr 4 09:46:08 2012 New Revision: 1309305 URL: http://svn.apache.org/viewvc?rev=1309305&view=rev Log: OAK-9: Internal tree builder add missing check for null Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java?rev=1309305&r1=1309304&r2=1309305&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TransientNodeState.java Wed Apr 4 09:46:08 2012 @@ -74,7 +74,7 @@ public class TransientNodeState { return state; } - return removedProperties.contains(name) + return removedProperties.contains(name) || persistentState == null ? null : persistentState.getProperty(name); } @@ -102,7 +102,7 @@ public class TransientNodeState { added.putAll(addedProperties); final Iterable - persistedProperties = persistentState.getProperties(); + persistedProperties = persistentState.getProperties(); // fixme check for null return new Iterable() { @Override @@ -157,7 +157,7 @@ public class TransientNodeState { added.putAll(addedNodes); final Iterable - persistedNodes = persistentState.getChildNodeEntries(offset, count); + persistedNodes = persistentState.getChildNodeEntries(offset, count); // fixme check for null return new Iterable() { @Override @@ -255,8 +255,11 @@ public class TransientNodeState { } private TransientNodeState getExistingChildNode(String name) { - NodeState state = persistentState.getChildNode(name); + if (persistentState == null) { + return null; + } + NodeState state = persistentState.getChildNode(name); TransientNodeState transientState = existingChildNodes.get(state); if (transientState == null) { transientState = new TransientNodeState(editor, name, state);