jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1494685 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: ItemImpl.java NodeImpl.java PropertyImpl.java
Date Wed, 19 Jun 2013 16:34:22 GMT
Author: jukka
Date: Wed Jun 19 16:34:22 2013
New Revision: 1494685

URL: http://svn.apache.org/r1494685
Log:
OAK-702: Optimize access to node type information

No more need for ItemImpl.internalGetDefinition()

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java

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=1494685&r1=1494684&r2=1494685&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
Wed Jun 19 16:34:22 2013
@@ -274,8 +274,6 @@ abstract class ItemImpl<T extends ItemDe
         dlg.checkNotStale();
     }
 
-    protected abstract ItemDefinition internalGetDefinition() throws RepositoryException;
-
     void checkProtected() throws RepositoryException {
         if (dlg.isProtected()) {
             throw new ConstraintViolationException("Item is protected.");

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=1494685&r1=1494684&r2=1494685&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:34:22 2013
@@ -1285,8 +1285,7 @@ public class NodeImpl<T extends NodeDele
 
     //------------------------------------------------------------< internal >---
 
-    @Override
-    protected final NodeDefinition internalGetDefinition() throws RepositoryException {
+    private final NodeDefinition internalGetDefinition() throws RepositoryException {
         NodeDelegate parent = dlg.getParent();
         if (parent == null) {
             return getDefinitionProvider().getRootDefinition();

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java?rev=1494685&r1=1494684&r2=1494685&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
Wed Jun 19 16:34:22 2013
@@ -388,7 +388,8 @@ public class PropertyImpl extends ItemIm
         return perform(new ItemReadOperation<PropertyDefinition>() {
             @Override
             protected PropertyDefinition perform() throws RepositoryException {
-                return internalGetDefinition();
+                return getDefinitionProvider().getDefinition(
+                        dlg.getParent().getTree(), dlg.getPropertyState(), true);
             }
         });
     }
@@ -415,12 +416,6 @@ public class PropertyImpl extends ItemIm
 
     //------------------------------------------------------------< internal >---
 
-    @Override
-    protected final PropertyDefinition internalGetDefinition() throws RepositoryException
{
-        return getDefinitionProvider().getDefinition(
-                dlg.getParent().getTree(), dlg.getPropertyState(), true);
-    }
-
     /**
      * Return the length of the specified JCR value object.
      *



Mime
View raw message