Author: mduerig
Date: Thu Feb 20 17:09:30 2014
New Revision: 1570277
URL: http://svn.apache.org/r1570277
Log:
OAK-1353: Test org.apache.jackrabbit.mk.ConcurrentWriteIT execute in single
thread.
Applied patch from Shashank Gupta. Credits!
Modified:
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
Modified:
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java?rev=1570277&r1=1570276&r2=1570277&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
(original)
+++
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteIT.java
Thu Feb 20 17:09:30 2014
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.mk;
+import java.util.Random;
+
import junit.framework.TestCase;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import java.util.Random;
-
public class ConcurrentWriteIT extends TestCase {
protected static final String TEST_PATH = "/" +
ConcurrentWriteIT.class.getName();
@@ -58,6 +58,11 @@ public class ConcurrentWriteIT extends T
for (TestThread t : threads) {
if (t != null) {
t.start();
+ }
+ }
+
+ for (TestThread t : threads) {
+ if (t != null) {
t.join();
}
}