Author: jukka
Date: Wed Jun 19 16:44:15 2013
New Revision: 1494689
URL: http://svn.apache.org/r1494689
Log:
OAK-702: Optimize access to node type information
No more need for NodeImpl.internalGetDefinition() either
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.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=1494689&r1=1494688&r2=1494689&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 Jun 19 16:44:15 2013
@@ -918,7 +918,13 @@ public class NodeImpl<T extends NodeDele
return perform(new ItemReadOperation<NodeDefinition>() {
@Override
protected NodeDefinition perform() throws RepositoryException {
- return internalGetDefinition();
+ NodeDelegate parent = dlg.getParent();
+ if (parent == null) {
+ return getDefinitionProvider().getRootDefinition();
+ } else {
+ return getDefinitionProvider().getDefinition(
+ parent.getTree(), dlg.getTree());
+ }
}
});
}
@@ -1285,16 +1291,6 @@ public class NodeImpl<T extends NodeDele
//------------------------------------------------------------< internal
>---
- private final NodeDefinition internalGetDefinition() throws
RepositoryException {
- NodeDelegate parent = dlg.getParent();
- if (parent == null) {
- return getDefinitionProvider().getRootDefinition();
- } else {
- return getDefinitionProvider().getDefinition(
- parent.getTree(), dlg.getTree());
- }
- }
-
private EffectiveNodeType getEffectiveNodeType() throws
RepositoryException {
return
getEffectiveNodeTypeProvider().getEffectiveNodeType(dlg.getTree());
}
