From commits-return-12393-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Nov 7 17:31:28 2011 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 6B89B7EA6 for ; Mon, 7 Nov 2011 17:31:28 +0000 (UTC) Received: (qmail 27688 invoked by uid 500); 7 Nov 2011 17:31:28 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 27659 invoked by uid 500); 7 Nov 2011 17:31:28 -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 27652 invoked by uid 99); 7 Nov 2011 17:31:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Nov 2011 17:31:28 +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; Mon, 07 Nov 2011 17:31:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2241123888FE; Mon, 7 Nov 2011 17:31:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1198827 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java Date: Mon, 07 Nov 2011 17:31:07 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111107173107.2241123888FE@eris.apache.org> Author: reschke Date: Mon Nov 7 17:31:06 2011 New Revision: 1198827 URL: http://svn.apache.org/viewvc?rev=1198827&view=rev Log: JCR-3139: missing sync in InternalVersionManagerImpl.externalUpdate can cause ConcurrentModificationException added synchronization Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java?rev=1198827&r1=1198826&r2=1198827&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java Mon Nov 7 17:31:06 2011 @@ -645,9 +645,12 @@ public class InternalVersionManagerImpl Collection items = new ArrayList(); - for (Map.Entry entry : versionItems.entrySet()) { - if (changes.has(entry.getKey())) { - items.add(entry.getValue()); + synchronized (versionItems) { + for (Map.Entry entry : versionItems + .entrySet()) { + if (changes.has(entry.getKey())) { + items.add(entry.getValue()); + } } } itemsUpdated(items);