From commits-return-9795-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Mar 26 15:05:47 2010
Return-Path: <commits-return-9795-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 62846 invoked from network); 26 Mar 2010 15:05:47 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 26 Mar 2010 15:05:47 -0000
Received: (qmail 75860 invoked by uid 500); 26 Mar 2010 15:05:47 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 75829 invoked by uid 500); 26 Mar 2010 15:05:47 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 75822 invoked by uid 99); 26 Mar 2010 15:05:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Mar 2010 15:05:47 +0000
X-ASF-Spam-Status: No, hits=-1317.6 required=10.0
	tests=ALL_TRUSTED,AWL
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; Fri, 26 Mar 2010 15:05:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 544042388903; Fri, 26 Mar 2010 15:05:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927900 -
 /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
Date: Fri, 26 Mar 2010 15:05:26 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100326150526.544042388903@eris.apache.org>

Author: jukka
Date: Fri Mar 26 15:05:26 2010
New Revision: 927900

URL: http://svn.apache.org/viewvc?rev=927900&view=rev
Log:
JCR-2586: Missing synchronization in InternalVersionHistoryImpl

Also synchronize relevant parts of InternalVersionImpl (thanks, Toby!)

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java?rev=927900&r1=927899&r2=927900&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java Fri Mar 26 15:05:26 2010
@@ -244,7 +244,7 @@ class InternalVersionImpl extends Intern
     /**
      * Clear the list of predecessors/successors and the label cache.
      */
-    void clear() {
+    synchronized void clear() {
         labelCache = null;
     }
 
@@ -367,7 +367,7 @@ class InternalVersionImpl extends Intern
      * @param label label to add
      * @return <code>true</code> if the label was added
      */
-    boolean internalAddLabel(Name label) {
+    synchronized boolean internalAddLabel(Name label) {
         if (labelCache == null) {
             labelCache = new HashSet<Name>();
         }
@@ -380,7 +380,7 @@ class InternalVersionImpl extends Intern
      * @param label label to remove
      * @return <code>true</code> if the label was removed
      */
-    boolean internalRemoveLabel(Name label) {
+    synchronized boolean internalRemoveLabel(Name label) {
         return labelCache != null && labelCache.remove(label);
     }
 
@@ -390,7 +390,7 @@ class InternalVersionImpl extends Intern
      * @param label label to check
      * @return <code>true</code> if the label exists
      */
-    boolean internalHasLabel(Name label) {
+    synchronized boolean internalHasLabel(Name label) {
         return labelCache != null && labelCache.contains(label);
     }
 
@@ -399,7 +399,7 @@ class InternalVersionImpl extends Intern
      *
      * @return the internal labels
      */
-    Name[] internalGetLabels() {
+    synchronized Name[] internalGetLabels() {
         if (labelCache == null) {
             return new Name[0];
         } else {