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/11/26 13:44:23 UTC
svn commit: r1545636 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
Author: mduerig
Date: Tue Nov 26 12:44:22 2013
New Revision: 1545636
URL: http://svn.apache.org/r1545636
Log:
OAK-1176: ObservationTest#observationDispose fails every now and then
Reverting some changes from rev. 1541935 as these where very likely made accidentally (left over from reviewing an earlier patch).
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java?rev=1545636&r1=1545635&r2=1545636&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java Tue Nov 26 12:44:22 2013
@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
* to just one change.
*/
public class BackgroundObserver implements Observer {
- private static final Logger log = LoggerFactory.getLogger(BackgroundObserver.class);
private static class ContentChange {
private final NodeState root;
@@ -144,14 +143,7 @@ public class BackgroundObserver implemen
public synchronized void stop() {
queue.clear();
queue.add(STOP);
- try {
- if (thread != Thread.currentThread()) {
- thread.join();
- }
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- log.warn("Thread interrupted while joining observation thread.", e);
- }
+ // no need to join the thread; it will stop when encountering the STOP
}
//----------------------------------------------------------< Observer >--