jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1463931 - in /jackrabbit/oak/trunk/oak-jcr/src: main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
Date Wed, 03 Apr 2013 11:48:29 GMT
Author: mduerig
Date: Wed Apr  3 11:48:29 2013
New Revision: 1463931

URL: http://svn.apache.org/r1463931
Log:
OAK-738: Assertion error when adding node with expanded name

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1463931&r1=1463930&r2=1463931&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Wed Apr  3 11:48:29 2013
@@ -240,8 +240,7 @@ public class NodeImpl<T extends NodeDele
                 String ntName = primaryNodeTypeName;
                 if (ntName == null) {
                     DefinitionProvider dp = getDefinitionProvider();
-                    String childName = getOakName(PathUtils.getName(relPath));
-                    NodeDefinition def = dp.getDefinition(parent.getTree(), childName);
+                    NodeDefinition def = dp.getDefinition(parent.getTree(), oakName);
                     ntName = def.getDefaultPrimaryTypeName();
                     if (ntName == null) {
                         throw new ConstraintViolationException(

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1463931&r1=1463930&r2=1463931&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
Wed Apr  3 11:48:29 2013
@@ -491,7 +491,6 @@ public class RepositoryTest extends Abst
     }
 
     @Test
-    @Ignore
     public void testAddNodeWithExpandedName() throws RepositoryException {
         Session session = getAdminSession();
 



Mime
View raw message