svn commit: r1702865 - /sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java

[cziegeler]

Author: cziegeler
Date: Mon Sep 14 08:20:03 2015
New Revision: 1702865

URL: http://svn.apache.org/r1702865
Log:
SLING-5019 : ServiceUserMappedBundleFilter should be immediate

Modified:
    
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java

Modified: 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java?rev=1702865&r1=1702864&r2=1702865&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java
 (original)
+++ 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMappedBundleFilter.java
 Mon Sep 14 08:20:03 2015
@@ -19,9 +19,12 @@
 
 package org.apache.sling.serviceusermapping.impl;
 
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceEvent;
@@ -30,17 +33,14 @@ import org.osgi.framework.hooks.service.
 import org.osgi.framework.hooks.service.FindHook;
 import org.osgi.framework.hooks.service.ListenerHook;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-@Component
+@Component(immediate=true) // framework gets/ungets hooks each time
 @Service(value = {EventListenerHook.class, FindHook.class} )
 /**
  * The <code>ServiceUserMappingBundleFilter</code> only allows the bundle for 
which the service mapping is available to see it.
  */
 public class ServiceUserMappedBundleFilter implements EventListenerHook, 
FindHook {
 
+    @Override
     public void event(ServiceEvent serviceEvent, Map map) {
 
         ServiceReference serviceReference = serviceEvent.getServiceReference();
@@ -61,6 +61,7 @@ public class ServiceUserMappedBundleFilt
         }
     }
 
+    @Override
     public void find(BundleContext bundleContext, String name, String filter, 
boolean allServices,
                      Collection references) {
         String bundleServiceName = 
ServiceUserMapperImpl.getServiceName(bundleContext.getBundle());