You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/10/01 15:12:21 UTC
svn commit: r1528078 -
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Author: mduerig
Date: Tue Oct 1 13:12:21 2013
New Revision: 1528078
URL: http://svn.apache.org/r1528078
Log:
OAK-1055: Occasional test failure in ObservationTest.observation
Better checking for exceptions during event processing
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=1528078&r1=1528077&r2=1528078&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 Oct 1 13:12:21 2013
@@ -401,11 +401,10 @@ public class ObservationTest extends Abs
private volatile Exception failed;
public Expectation expect(Expectation expectation) {
- if (failed == null) {
- expected.add(expectation);
- } else {
+ if (failed != null) {
expectation.fail(failed);
}
+ expected.add(expectation);
return expectation;
}