You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/06/06 14:11:48 UTC

svn commit: r1346843 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java

Author: angela
Date: Wed Jun  6 12:11:48 2012
New Revision: 1346843

URL: http://svn.apache.org/viewvc?rev=1346843&view=rev
Log:
NodeTypeImpl#isNodeType(String) doesn't deal with expanded names

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java?rev=1346843&r1=1346842&r2=1346843&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java Wed Jun  6 12:11:48 2012
@@ -215,11 +215,12 @@ class NodeTypeImpl implements NodeType {
 
     @Override
     public boolean isNodeType(String nodeTypeName) {
-        if (nodeTypeName.equals(getName())) {
+        String oakName = mapper.getOakName(nodeTypeName);
+        if (dlg.getName().equals(oakName)) {
             return true;
         }
         for (NodeType type : getSupertypes()) {
-            if (nodeTypeName.equals(type.getName())) {
+            if (((NodeTypeImpl) type).dlg.getName().equals(oakName)) {
                 return true;
             }
         }