Merge pull request #1248 from akarnokd/SchedulerTestConcurrentFix

benjchristensen · benjchristensen · commit 4f6705b8cd07 · 2014-05-22T21:21:09.000-07:00
Fixed testConcurrentOnNextFailsValidation
diff --git a/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java b/rxjava-core/src/test/java/rx/schedulers/AbstractSchedulerTests.java
@@ -453,8 +453,8 @@ public void onCompleted() {
 
         @Override
         public void onError(Throwable e) {
-            completed.countDown();
             error.set(e);
+            completed.countDown();
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -453,8 +453,8 @@ public void onCompleted() {`
`453`	`453`
`454`	`454`	`@Override`
`455`	`455`	`public void onError(Throwable e) {`
`456`		`- completed.countDown();`
`457`	`456`	`error.set(e);`
	`457`	`+ completed.countDown();`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`@Override`