appium#283 fix: The locking is fair now.

TikhomirovSergey · TikhomirovSergey · commit c271d7fa91c2 · 2016-01-12T18:42:55.000+03:00
+ Multithreading test improvement.
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
@@ -44,7 +44,7 @@ public final class AppiumDriverLocalService extends DriverService {
     private final String ipAddress;
     private final long startupTimeout;
     private final TimeUnit timeUnit;
-    private final ReentrantLock lock = new ReentrantLock();
+    private final ReentrantLock lock = new ReentrantLock(true);
     private final ListOutputStream stream = new ListOutputStream().add(System.out);
 
 
diff --git a/src/test/java/io/appium/java_client/localserver/ThreadSafetyTest.java b/src/test/java/io/appium/java_client/localserver/ThreadSafetyTest.java
@@ -204,8 +204,10 @@ public void whenFewTreadsDoDifferentWork() throws Throwable {
             assertTrue(stopTestThread.result.equals("OK")); //and then the test tried to shut down it (see (3))
             assertTrue(!service.isRunning());
 
-            stopThread2.start(); // (1)
-            isRunningThread2.start(); // (2)
+            isRunningThread2.start(); // (1)
+            Thread.sleep(10);
+            stopThread2.start(); // (2)
+            Thread.sleep(10);
             runThread2.start(); //(3)
 
             while (runThread2.isAlive() || isRunningThread2.isAlive() || stopThread2.isAlive()) {
@@ -224,8 +226,8 @@ public void whenFewTreadsDoDifferentWork() throws Throwable {
                 throw stopTestThread.t;
             }
 
-            assertTrue(stopTestThread2.result.equals("OK")); //the service had not been started firstly (see (1)), it is ok
-            assertTrue(isRunningTestThread2.result.equals(false)); //so it couldn't being running (see (2))
+            assertTrue(isRunningTestThread2.result.equals(false)); //the service wasn't being running (see (1))
+            assertTrue(stopTestThread2.result.equals("OK")); //the service had not been started firstly (see (2)), it is ok
             assertTrue(runTestThread2.result.equals("OK")); //and then it was started (see (3))
             assertTrue(service.isRunning());
         }
