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 8DC299A07 for ; Mon, 30 Apr 2012 14:36:07 +0000 (UTC) Received: (qmail 49185 invoked by uid 500); 30 Apr 2012 14:36:07 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 49161 invoked by uid 500); 30 Apr 2012 14:36:07 -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 49153 invoked by uid 99); 30 Apr 2012 14:36:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2012 14:36:07 +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; Mon, 30 Apr 2012 14:36:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 29168238896F; Mon, 30 Apr 2012 14:35:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1332223 - in /jackrabbit/oak/trunk: oak-it/jcr/pom.xml oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java Date: Mon, 30 Apr 2012 14:35:44 -0000 To: oak-commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120430143544.29168238896F@eris.apache.org> Author: reschke Date: Mon Apr 30 14:35:43 2012 New Revision: 1332223 URL: http://svn.apache.org/viewvc?rev=1332223&view=rev Log: OAK-6: band-aid for exception mapping in name mapper, updated test exclusions Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/jcr/pom.xml?rev=1332223&r1=1332222&r2=1332223&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/jcr/pom.xml Mon Apr 30 14:35:43 2012 @@ -46,7 +46,6 @@ org.apache.jackrabbit.test.api.NodeDiscoveringNodeTypesTest#testIsNodeType org.apache.jackrabbit.test.api.NamespaceRemappingTest#testNamespaceRemapping -org.apache.jackrabbit.test.api.NamespaceRemappingTest#testExceptionOnUnknownPrefix org.apache.jackrabbit.test.api.SessionReadMethodsTest#testGetNodeByUUIDFailure org.apache.jackrabbit.test.api.ExportSysViewTest org.apache.jackrabbit.test.api.ExportDocViewTest Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java?rev=1332223&r1=1332222&r2=1332223&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java Mon Apr 30 14:35:43 2012 @@ -165,7 +165,12 @@ abstract class ItemImpl implements Item String toOakPath(String jcrPath) throws RepositoryException { - return sessionContext.getNamePathMapper().toOakPath(jcrPath); + try { + return sessionContext.getNamePathMapper().toOakPath(jcrPath); + } catch (IllegalArgumentException ex) { + // TODO we shouldn't have to catch this one + throw new RepositoryException(ex); + } } String toJcrPath(String oakPath) {