Return-Path: 
 <oak-commits-return-6217-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
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 80300107CB
	for <apmail-jackrabbit-oak-commits-archive@minotaur.apache.org>;
 Tue,  4 Mar 2014 16:41:04 +0000 (UTC)
Received: (qmail 64960 invoked by uid 500); 4 Mar 2014 16:41:04 -0000
Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org
Received: (qmail 64924 invoked by uid 500); 4 Mar 2014 16:41:01 -0000
Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:oak-commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:oak-commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:oak-commits@jackrabbit.apache.org>
List-Id: <oak-commits.jackrabbit.apache.org>
Reply-To: oak-dev@jackrabbit.apache.org
Delivered-To: mailing list oak-commits@jackrabbit.apache.org
Received: (qmail 64897 invoked by uid 99); 4 Mar 2014 16:40:57 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2014 16:40:57 +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, 04 Mar 2014 16:40:55 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 97EA4238899C;
	Tue,  4 Mar 2014 16:40:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1574129 -
 /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Date: Tue, 04 Mar 2014 16:40:34 -0000
To: oak-commits@jackrabbit.apache.org
From: mduerig@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140304164034.97EA4238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mduerig
Date: Tue Mar  4 16:40:34 2014
New Revision: 1574129

URL: http://svn.apache.org/r1574129
Log:
OAK-1491: ObservationTest failure on Windows
Use synchronized collections to ensure happens before relation holds when accessing them from different threads

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java?rev=1574129&r1=1574128&r2=1574129&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java Tue Mar  4 16:40:34 2014
@@ -19,6 +19,8 @@
 package org.apache.jackrabbit.oak.jcr.observation;
 
 import static com.google.common.base.Objects.equal;
+import static java.util.Collections.synchronizedList;
+import static java.util.Collections.synchronizedSet;
 import static javax.jcr.observation.Event.NODE_ADDED;
 import static javax.jcr.observation.Event.NODE_MOVED;
 import static javax.jcr.observation.Event.NODE_REMOVED;
@@ -764,8 +766,10 @@ public class ObservationTest extends Abs
     }
 
     private static class ExpectationListener implements EventListener {
-        private final Set<Expectation> expected = Sets.newCopyOnWriteArraySet();
-        private final List<Event> unexpected = Lists.newCopyOnWriteArrayList();
+        private final Set<Expectation> expected = synchronizedSet(
+                Sets.<Expectation>newCopyOnWriteArraySet());
+        private final List<Event> unexpected = synchronizedList(
+                Lists.<Event>newCopyOnWriteArrayList());
 
         private volatile Exception failed;