Author: mreutegg
Date: Thu Feb 14 20:44:35 2013
New Revision: 1446319
URL: http://svn.apache.org/r1446319
Log:
OAK-618: ChangeProcessor must ignore hidden properties
- missed another place to check for hidden properties
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java?rev=1446319&r1=1446318&r2=1446319&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
Thu Feb 14 20:44:35 2013
@@ -28,6 +28,7 @@ import javax.jcr.observation.Event;
import javax.jcr.observation.EventListener;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.commons.iterator.EventIteratorAdapter;
import org.apache.jackrabbit.oak.spi.observation.ChangeExtractor;
@@ -259,7 +260,14 @@ class ChangeProcessor implements Runnabl
Iterator<Event> propertyEvents;
if (filter.include(propertyEventType, jcrPath,
associatedParentNode)) {
propertyEvents = Iterators.transform(
- node.getProperties().iterator(),
+ Iterators.filter(
+ node.getProperties().iterator(),
+ new Predicate<PropertyState>() {
+ @Override
+ public boolean apply(PropertyState
propertyState) {
+ return
!NodeStateUtils.isHidden(propertyState.getName());
+ }
+ }),
new Function<PropertyState, Event>() {
@Override
public Event apply(PropertyState property) {
