From commits-return-11482-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Jul 15 21:19:00 2011 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 348406C36 for ; Fri, 15 Jul 2011 21:19:00 +0000 (UTC) Received: (qmail 45478 invoked by uid 500); 15 Jul 2011 21:19:00 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 45418 invoked by uid 500); 15 Jul 2011 21:18:59 -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 45411 invoked by uid 99); 15 Jul 2011 21:18:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2011 21:18:59 +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, 15 Jul 2011 21:18:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4775223888BD; Fri, 15 Jul 2011 21:18:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1147320 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/SessionImpl.java test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java Date: Fri, 15 Jul 2011 21:18:35 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110715211835.4775223888BD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Fri Jul 15 21:18:34 2011 New Revision: 1147320 URL: http://svn.apache.org/viewvc?rev=1147320&view=rev Log: JCR-3014: Identifier paths for inexistent items throw exception Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=1147320&r1=1147319&r2=1147320&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Fri Jul 15 21:18:34 2011 @@ -790,6 +790,15 @@ public class SessionImpl extends Abstrac */ @Override public boolean itemExists(String absPath) throws RepositoryException { + if (absPath != null && absPath.startsWith("[") && absPath.endsWith("]")) { + // an identifier segment has been specified (JCR-3014) + try { + NodeId id = NodeId.valueOf(absPath.substring(1, absPath.length() - 1)); + return getItemManager().itemExists(id); + } catch (IllegalArgumentException e) { + throw new MalformedPathException(absPath); + } + } return perform(SessionItemOperation.itemExists(absPath)); } @@ -1111,6 +1120,15 @@ public class SessionImpl extends Abstrac */ @Override public boolean nodeExists(String absPath) throws RepositoryException { + if (absPath != null && absPath.startsWith("[") && absPath.endsWith("]")) { + // an identifier segment has been specified (JCR-3014) + try { + NodeId id = NodeId.valueOf(absPath.substring(1, absPath.length() - 1)); + return getItemManager().itemExists(id); + } catch (IllegalArgumentException e) { + throw new MalformedPathException(absPath); + } + } return perform(SessionItemOperation.nodeExists(absPath)); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java?rev=1147320&r1=1147319&r2=1147320&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java Fri Jul 15 21:18:34 2011 @@ -27,6 +27,7 @@ import javax.security.auth.Subject; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.SessionImpl; +import org.apache.jackrabbit.core.id.NodeId; import org.apache.jackrabbit.core.security.principal.PrincipalImpl; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; @@ -162,4 +163,15 @@ public class SessionImplTest extends Abs // success } } + + /** + * JCR-3014 Identifier paths for inexistent items throw exception + * + * @see JCR-3014 + */ + public void testCheckNonExistingItem() throws Exception { + String dummyPath = "[" + NodeId.randomId() + "]"; + assertFalse(superuser.itemExists(dummyPath)); + assertFalse(superuser.nodeExists(dummyPath)); + } }