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 @@
<value>
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) {
