Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java	(revision cd330b36becfe259886799f52eef6e34c4533eb3)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java	(revision )
@@ -67,6 +67,7 @@
     private Closeable observer;
     private Registration mbean;
     private NodeState previousRoot;
+    private boolean stopping;
 
     public ChangeProcessor(
             ContentSession contentSession, NamePathMapper namePathMapper,
@@ -109,6 +110,7 @@
     public synchronized void stop() {
         checkState(observer != null, "Change processor not started");
         try {
+            stopping = true;
             mbean.unregister();
             observer.close();
         } catch (IOException e) {
@@ -131,7 +133,11 @@
                             provider.getFilter(afterTree),
                             new JcrListener(beforeTree, afterTree, namePathMapper, info));
                     if (events.hasNext()) {
+                        synchronized (this) {
+                            if (!stopping) {
-                        eventListener.onEvent(new EventIteratorAdapter(events));
+                                eventListener.onEvent(new EventIteratorAdapter(events));
+                            }
+                        }
                     }
                 }
             } catch (Exception e) {