svn commit: r1679386 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java

[tommaso]

Author: tommaso
Date: Thu May 14 14:39:41 2015
New Revision: 1679386

URL: http://svn.apache.org/r1679386
Log:
This closes #90
commit 514ce5913ccbad9e1fdd1010a392f904806cb64b
Author: Maciej Dybek <maciej.dy...@cognifide.com>
Date: 2015-05-14T12:04:16Z
SLING-4715 - Event filter in ResourceEventDistributionTrigger is wrongly 
configured

Modified:
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java?rev=1679386&r1=1679385&r2=1679386&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java
 Thu May 14 14:39:41 2015
@@ -85,8 +85,7 @@ public class ResourceEventDistributionTr
                 SlingConstants.TOPIC_RESOURCE_CHANGED, 
SlingConstants.TOPIC_RESOURCE_REMOVED});
         log.info("trigger agent {} on path '{}'", requestHandler, path);
 
-        properties.put(EventConstants.EVENT_FILTER, "(path=" + path + "/*)");
-        properties.put(EventConstants.EVENT_FILTER, "(!(" + 
DEAConstants.PROPERTY_APPLICATION + "=*))");
+        properties.put(EventConstants.EVENT_FILTER, "(&(path=" + path + "/*) 
(!(" + DEAConstants.PROPERTY_APPLICATION + "=*)))");
 
         ServiceRegistration triggerPathEventRegistration = 
bundleContext.registerService(EventHandler.class.getName(),
                 new TriggerAgentEventListener(requestHandler), properties);