Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 96E0268A9 for ; Tue, 19 Jul 2011 15:18:09 +0000 (UTC) Received: (qmail 96809 invoked by uid 500); 19 Jul 2011 15:18:09 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 96672 invoked by uid 500); 19 Jul 2011 15:18:08 -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 96665 invoked by uid 99); 19 Jul 2011 15:18:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 15:18:08 +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; Tue, 19 Jul 2011 15:18:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 34D5923888EA; Tue, 19 Jul 2011 15:17:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148390 - /jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java Date: Tue, 19 Jul 2011 15:17:46 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110719151747.34D5923888EA@eris.apache.org> Author: mduerig Date: Tue Jul 19 15:17:46 2011 New Revision: 1148390 URL: http://svn.apache.org/viewvc?rev=1148390&view=rev Log: spi2microkernel (WIP) - fix batch reading Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java?rev=1148390&r1=1148389&r2=1148390&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java Tue Jul 19 15:17:46 2011 @@ -54,7 +54,10 @@ public final class ItemInfos { InfoListener infoListener = new InfoListener() { public void createNodeInfo(NodeInfo nodeInfo) { - itemInfos.addFirst(nodeInfo); + if (nodeInfo.getChildInfos() != null) { + // null child node infos indicate an empty node. Do not include! + itemInfos.addFirst(nodeInfo); + } } public void createChildInfos(NodeId id, Iterator childInfos) {} @@ -198,10 +201,8 @@ public final class ItemInfos { @Override public boolean endObject() throws ParseException, IOException { try { - nodeInfoBuilder = isObjectEmpty - ? nodeInfoBuilder.getParent() - : nodeInfoBuilder.build(); - + nodeInfoBuilder.includeChildInfos(!isObjectEmpty); + nodeInfoBuilder = nodeInfoBuilder.build(); isObjectEmpty = false; return !infoListener.done(); }