[sling-org-apache-sling-resourcemerger] 13/15: SLING-5502 : Additions to MergedResourcePicker break existing implementations

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit d92f20ee88f116ff401679c215490571f810c518
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Feb 10 12:42:17 2016 +0000

    SLING-5502 : Additions to MergedResourcePicker break existing 
implementations
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1729589
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
index a940eea..086f916 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
@@ -35,6 +35,7 @@ import 
org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
 import org.apache.sling.spi.resource.provider.ResourceProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.util.tracker.ServiceTracker;
@@ -50,10 +51,10 @@ public class MergedResourcePickerWhiteboard implements 
ServiceTrackerCustomizer
     private final Map<Long, ServiceRegistration> serviceRegistrations = new 
ConcurrentHashMap<Long, ServiceRegistration>();
 
     @Activate
-    protected void activate(final BundleContext bundleContext) {
+    protected void activate(final BundleContext bundleContext) throws 
InvalidSyntaxException {
         this.bundleContext = bundleContext;
-        tracker = new ServiceTracker(bundleContext, "(|(objectClass=" + 
MergedResourcePicker.class.getName() +
-                ")(objectClass=" + MergedResourcePicker2.class.getName() + 
"))", this);
+        tracker = new ServiceTracker(bundleContext, 
bundleContext.createFilter("(|(objectClass=" + 
MergedResourcePicker.class.getName() +
+                ")(objectClass=" + MergedResourcePicker2.class.getName() + 
"))"), this);
         tracker.open();
     }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.