Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java	(revision 9ef9fde23d3d85b174e38fb320d6f758dad8bb7a)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java	(revision )
@@ -43,6 +43,7 @@
  * 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;
@@ -143,7 +144,12 @@
     public synchronized void stop() {
         queue.clear();
         queue.add(STOP);
-        // no need to join the thread; it will stop when encountering the STOP
+        try {
+            thread.join();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.warn("Thread interrupted while joining observation thread.", e);
+        }
     }
 
     //----------------------------------------------------------< Observer >--