Return-Path: 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 B9A2BF07B for ; Tue, 9 Apr 2013 16:36:17 +0000 (UTC) Received: (qmail 68539 invoked by uid 500); 9 Apr 2013 16:36:17 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 68524 invoked by uid 500); 9 Apr 2013 16:36:17 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 68516 invoked by uid 99); 9 Apr 2013 16:36:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Apr 2013 16:36:17 +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; Tue, 09 Apr 2013 16:36:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B86EF2388994; Tue, 9 Apr 2013 16:35:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466108 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: RootImpl.java TreeImpl.java Date: Tue, 09 Apr 2013 16:35:53 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130409163553.B86EF2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Tue Apr 9 16:35:53 2013 New Revision: 1466108 URL: http://svn.apache.org/r1466108 Log: OAK-709: Consider moving permission evaluation to the node state level fix getPropertyStatus Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1466108&r1=1466107&r2=1466108&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java Tue Apr 9 16:35:53 2013 @@ -233,7 +233,7 @@ public class RootImpl implements Root { @Override public void rebase() { checkLive(); - if (!store.getRoot().equals(rootTree.getBaseState())) { + if (!store.getRoot().equals(getBaseState())) { purgePendingChanges(); branch.rebase(); reset(); @@ -408,20 +408,20 @@ public class RootImpl implements Root { } @Nonnull - PermissionProvider getPermissionProvider() { - if (permissionProvider == null) { - permissionProvider = createPermissionProvider(); - } - return permissionProvider; - } - - @Nonnull String getWorkspaceName() { return workspaceName; } //------------------------------------------------------------< private >--- + @Nonnull + private PermissionProvider getPermissionProvider() { + if (permissionProvider == null) { + permissionProvider = createPermissionProvider(); + } + return permissionProvider; + } + /** * Purge all pending changes to the underlying {@link NodeStoreBranch}. */ Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1466108&r1=1466107&r2=1466108&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Tue Apr 9 16:35:53 2013 @@ -147,8 +147,7 @@ public class TreeImpl implements Tree { return null; } - // FIXME: This should be based on the secure base state - NodeState parentBase = getBaseState(); + NodeState parentBase = getSecureBase(); PropertyState base = parentBase.getProperty(name); if (base == null) { @@ -412,19 +411,6 @@ public class TreeImpl implements Tree { //-----------------------------------------------------------< internal >--- - /** - * The (possibly non-existent) node state this tree is based on. - * @return the base node state of this tree - */ - @Nonnull - final NodeState getBaseState() { - if (parent == null) { - return root.getBaseState(); - } else { - return parent.getBaseState().getChildNode(name); - } - } - @Nonnull NodeState getNodeState() { return nodeBuilder.getNodeState(); @@ -530,6 +516,19 @@ public class TreeImpl implements Tree { applyPendingMoves(); } + /** + * The (possibly non-existent) node state this tree is based on. + * @return the base node state of this tree + */ + @Nonnull + private NodeState getSecureBase() { + if (parent == null) { + return root.getSecureBase(); + } else { + return parent.getSecureBase().getChildNode(name); + } + } + private void applyPendingMoves() { if (parent != null) { parent.applyPendingMoves();