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 189E010EEC for ; Tue, 2 Jul 2013 09:10:44 +0000 (UTC) Received: (qmail 84421 invoked by uid 500); 2 Jul 2013 09:10:43 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 84325 invoked by uid 500); 2 Jul 2013 09:10:41 -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 84318 invoked by uid 99); 2 Jul 2013 09:10:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 09:10:40 +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, 02 Jul 2013 09:10:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 120E12388999; Tue, 2 Jul 2013 09:10:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1498850 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java Date: Tue, 02 Jul 2013 09:10:17 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130702091018.120E12388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue Jul 2 09:10:17 2013 New Revision: 1498850 URL: http://svn.apache.org/r1498850 Log: JCR-3617: Inconsistent CachingHierarchyManager under concurrent access - Preliminary fix This does not fix the root cause, but rather detects the inconsistent state and works around it after it happened. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?rev=1498850&r1=1498849&r2=1498850&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Tue Jul 2 09:10:17 2013 @@ -164,8 +164,10 @@ public class CachingHierarchyManager ext String msg = "failed to retrieve state of intermediary node for entry: " + entry.getId() + ", path: " + path.getString(); logItemStateException(msg, e); - throw new RepositoryException(msg, e); + log.debug(msg); } + // JCR-3617: fall back to super class in case of ItemStateException + return super.resolvePath(path, typesAllowed); } /** Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java?rev=1498850&r1=1498849&r2=1498850&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/CachingHierarchyManagerConsistencyTest.java Tue Jul 2 09:10:17 2013 @@ -47,10 +47,6 @@ public class CachingHierarchyManagerCons private static final String TEST_PATH = "/my/test/path"; public void testObservation() throws Exception { - if (true) { - // currently disabled - return; - } final List exceptions = new ArrayList(); Thread writer = new Thread(new Runnable() { public void run() {