svn commit: r1729589 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java

[cziegeler]

Author: cziegeler
Date: Wed Feb 10 12:42:17 2016
New Revision: 1729589

URL: http://svn.apache.org/viewvc?rev=1729589&view=rev
Log:
SLING-5502 : Additions to MergedResourcePicker break existing implementations

Modified:
    
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java

Modified: 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java?rev=1729589&r1=1729588&r2=1729589&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 (original)
+++ 
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 Wed Feb 10 12:42:17 2016
@@ -35,6 +35,7 @@ import org.apache.sling.resourcemerger.s
 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 MergedResourcePickerWhitebo
     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();
     }