Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B1CB9990A for ; Wed, 4 Jul 2012 13:48:18 +0000 (UTC) Received: (qmail 84962 invoked by uid 500); 4 Jul 2012 13:48:18 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 84926 invoked by uid 500); 4 Jul 2012 13:48:18 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 84917 invoked by uid 99); 4 Jul 2012 13:48:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 13:48:18 +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, 04 Jul 2012 13:48:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2855623888E7; Wed, 4 Jul 2012 13:47:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357265 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state: ItemStateReferenceCache.java SharedItemStateManager.java Date: Wed, 04 Jul 2012 13:47:57 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120704134757.2855623888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Wed Jul 4 13:47:56 2012 New Revision: 1357265 URL: http://svn.apache.org/viewvc?rev=1357265&view=rev Log: JCR-3345: ACL evaluation may return non-fresh results Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java?rev=1357265&r1=1357264&r2=1357265&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java Wed Jul 4 13:47:56 2012 @@ -172,10 +172,11 @@ public class ItemStateReferenceCache imp ItemId id = state.getId(); Map segment = getSegment(id); synchronized (segment) { - if (segment.containsKey(id)) { + ItemState s = segment.put(id, state); + // overwriting the same instance is OK + if (s != null && s != state) { log.warn("overwriting cached entry " + id); } - segment.put(id, state); } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1357265&r1=1357264&r2=1357265&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Wed Jul 4 13:47:56 2012 @@ -787,6 +787,17 @@ public class SharedItemStateManager ISMLocking.ReadLock readLock = null; try { + // make sure new item states are present/referenced in cache + // we do this before the lock is downgraded to a read lock + // because then other threads will be able to read from + // this SISM again and potentially read an added item state + // before the ones here are put into the cache (via + // shared.persisted()). See JCR-3345 + for (ItemState state : shared.addedStates()) { + state.setStatus(ItemState.STATUS_EXISTING); + cache.cache(state); + } + // downgrade to read lock readLock = writeLock.downgrade(); writeLock = null;