svn commit: r1783975 - in /jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation: ChangeProcessor.java ObservationManagerImpl.java

[stefanegli]

Author: stefanegli
Date: Wed Feb 22 08:14:15 2017
New Revision: 1783975

URL: http://svn.apache.org/viewvc?rev=1783975&view=rev
Log:
OAK-5742 : merged from trunk : logging more details in case stopAndWait returns 
false - to allow narrowing down a listener that might be hiding further behind

Modified:
    
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
    
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java

Modified: 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1783975&r1=1783974&r2=1783975&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
 Wed Feb 22 08:14:15 2017
@@ -632,6 +632,18 @@ class ChangeProcessor implements Filteri
                 + ", running=" + running.isSatisfied() + "]";
     }
 
+    /** for logging only **/
+    String getListenerToString() {
+        if (tracker == null) {
+            return "null";
+        }
+        EventListenerMBean listenerMBean = tracker.getListenerMBean();
+        if (listenerMBean == null) {
+            return "null (no listener mbean)";
+        }
+        return listenerMBean.getToString();
+    }
+
     /**
      * Evaluate the prefilter for a given commit.
      * @param changeSet 

Modified: 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java?rev=1783975&r1=1783974&r2=1783975&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
 Wed Feb 22 08:14:15 2017
@@ -459,7 +459,10 @@ public class ObservationManagerImpl impl
                     "Timed out waiting for change processor to stop after "
                             + STOP_TIME_OUT
                             + " milliseconds. Falling back to asynchronous 
stop on "
-                            + processor);
+                            + processor
+                            + " (listener details: '"
+                            + processor.getListenerToString()
+                            + "')");
             processor.stop();
         }
     }