Author: reschke
Date: Thu Apr 6 11:44:27 2017
New Revision: 1790383
URL: http://svn.apache.org/viewvc?rev=1790383&view=rev
Log:
OAK-5619 : fixing withIncludeAncestorsRemove which reported /unrelated parent
NODE_REMOVEs
(fix javadoc) (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/filter/OakEventFilter.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 6 11:44:27 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217,1788378
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217,1788378,1790382
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/filter/OakEventFilter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/filter/OakEventFilter.java?rev=1790383&r1=1790382&r2=1790383&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/filter/OakEventFilter.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/filter/OakEventFilter.java
Thu Apr 6 11:44:27 2017
@@ -63,7 +63,7 @@ public abstract class OakEventFilter ext
* <li>include path /a/b/** results in additional !deep NODE_REMOVED
* filter on /a, /a/b and /a/b/**</li>
* <li>include path /a/b/**{@code /}*.jsp results in additional
- * deep NODE_REMOVED filter on /a, /a/b and /a/b/** <br/>
+ * deep NODE_REMOVED filter on /a, /a/b and /a/b/** <br>
* Note that this and the above result in the same additional
* include paths since all this includeAncestorsRemove flag
* does is include potential ancestors, it doesn't guarantee
