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 6CC1E73FD for ; Fri, 19 Aug 2011 17:51:41 +0000 (UTC) Received: (qmail 10568 invoked by uid 500); 19 Aug 2011 17:51:41 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 10535 invoked by uid 500); 19 Aug 2011 17:51:40 -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 10528 invoked by uid 99); 19 Aug 2011 17:51:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2011 17:51:40 +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; Fri, 19 Aug 2011 17:51:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8FD3123889EA; Fri, 19 Aug 2011 17:51:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1159712 - in /jackrabbit/sandbox/jackrabbit-mk: ./ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java Date: Fri, 19 Aug 2011 17:51:16 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110819175116.8FD3123889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Fri Aug 19 17:51:16 2011 New Revision: 1159712 URL: http://svn.apache.org/viewvc?rev=1159712&view=rev Log: Microkernel based Jackrabbit prototype (WIP) - merge changes from trunk Modified: jackrabbit/sandbox/jackrabbit-mk/ (props changed) jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java Propchange: jackrabbit/sandbox/jackrabbit-mk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 19 17:51:16 2011 @@ -1,2 +1,2 @@ /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038 -/jackrabbit/trunk:1158344-1159347 +/jackrabbit/trunk:1158344-1159708 Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java?rev=1159712&r1=1159711&r2=1159712&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoBuilder.java Fri Aug 19 17:51:16 2011 @@ -765,7 +765,7 @@ public final class ItemInfoBuilder { String ns = namespace == null ? Name.NS_DEFAULT_URI : namespace; name = NameFactoryImpl.getInstance().create(ns, localName); } - Path path = PathFactoryImpl.getInstance().create(parentId.getPath(), name, true); + Path path = PathFactoryImpl.getInstance().create(parent.getPath(), name, true); PropertyId id = IdFactoryImpl.getInstance().createPropertyId(parentId, name); propertyInfo = new PropertyInfoImpl(path, id, type, isMultivalued,