Return-Path: 
 <oak-commits-return-4094-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A652A10799
	for <apmail-jackrabbit-oak-commits-archive@minotaur.apache.org>;
 Wed, 19 Jun 2013 16:44:39 +0000 (UTC)
Received: (qmail 38916 invoked by uid 500); 19 Jun 2013 16:44:39 -0000
Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org
Received: (qmail 38880 invoked by uid 500); 19 Jun 2013 16:44:39 -0000
Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:oak-commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:oak-commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:oak-commits@jackrabbit.apache.org>
List-Id: <oak-commits.jackrabbit.apache.org>
Reply-To: oak-dev@jackrabbit.apache.org
Delivered-To: mailing list oak-commits@jackrabbit.apache.org
Received: (qmail 38872 invoked by uid 99); 19 Jun 2013 16:44:38 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 16:44:38 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 16:44:36 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 48CC523889ED;
	Wed, 19 Jun 2013 16:44:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1494689 -
 /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Date: Wed, 19 Jun 2013 16:44:16 -0000
To: oak-commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130619164416.48CC523889ED@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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());
     }