Author: mreutegg
Date: Tue Apr 25 11:21:06 2017
New Revision: 1792599
URL: http://svn.apache.org/viewvc?rev=1792599&view=rev
Log:
OAK-6127: Incorrect annotation for aggregator parameter in EventQueue
constructor
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java?rev=1792599&r1=1792598&r2=1792599&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
Tue Apr 25 11:21:06 2017
@@ -69,9 +69,10 @@ public interface FilterProvider extends
FilterConfigMBean getConfigMBean();
/**
- * Allows providers to supply an EventAggregator that
+ * Allows providers to supply an optional EventAggregator that
* is used to adjust (aggregate) the event identifier before event
* creation (ie after event filtering).
*/
+ @CheckForNull
EventAggregator getEventAggregator();
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java?rev=1792599&r1=1792598&r2=1792599&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventQueue.java
Tue Apr 25 11:21:06 2017
@@ -24,6 +24,7 @@ import java.util.LinkedList;
import java.util.NoSuchElementException;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.jcr.observation.Event;
import javax.jcr.observation.EventIterator;
@@ -52,7 +53,7 @@ class EventQueue implements EventIterato
@Nonnull NamePathMapper mapper, CommitInfo info,
@Nonnull NodeState before, @Nonnull NodeState after,
@Nonnull Iterable<String> basePaths, @Nonnull EventFilter filter,
- @Nonnull EventAggregator aggregator) {
+ @Nullable EventAggregator aggregator) {
this.generator = new EventGenerator();
EventFactory factory = new EventFactory(mapper, info);
EventHandler handler = new FilteredHandler(
