You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2016/05/12 19:35:40 UTC
svn commit: r1743549 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
Author: djencks
Date: Thu May 12 19:35:40 2016
New Revision: 1743549
URL: http://svn.apache.org/viewvc?rev=1743549&view=rev
Log:
Undo accidentally pushed rev 1743541
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java?rev=1743549&r1=1743548&r2=1743549&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java Thu May 12 19:35:40 2016
@@ -96,13 +96,12 @@ public class BundleComponentActivator im
private final Map<String, ListenerInfo> listenerMap = new HashMap<String, ListenerInfo>();
- private class ListenerInfo implements ServiceListener
+ private static class ListenerInfo implements ServiceListener
{
private Map<Filter, List<ExtendedServiceListener<ExtendedServiceEvent>>> filterMap = new HashMap<Filter, List<ExtendedServiceListener<ExtendedServiceEvent>>>();
public void serviceChanged(ServiceEvent event)
{
- log(LogService.LOG_DEBUG, "Service event: {0}", new Object[] {event}, null, null, null);
ServiceReference<?> ref = event.getServiceReference();
ExtendedServiceEvent extEvent = null;
ExtendedServiceEvent endMatchEvent = null;
@@ -122,7 +121,6 @@ public class BundleComponentActivator im
}
for (ExtendedServiceListener<ExtendedServiceEvent> forwardTo : entry.getValue())
{
- log(LogService.LOG_DEBUG, "Service event {0} filter {1} forwarding to: {2}", new Object[] {extEvent, filter, forwardTo}, null, null, null);
forwardTo.serviceChanged(extEvent);
}
}
@@ -135,23 +133,16 @@ public class BundleComponentActivator im
}
for (ExtendedServiceListener<ExtendedServiceEvent> forwardTo : entry.getValue())
{
- log(LogService.LOG_DEBUG, "Service endmatch event {0} filter {1} forwarding to: {2}", new Object[] {endMatchEvent, filter, forwardTo}, null, null, null);
forwardTo.serviceChanged(endMatchEvent);
}
}
- else
- {
- log(LogService.LOG_DEBUG, "Service event {0} filter {1} no match", new Object[] {endMatchEvent, filter}, null, null, null);
- }
}
if (extEvent != null)
{
- log(LogService.LOG_DEBUG, "Service event {0} activating managers", new Object[] {extEvent}, null, null, null);
extEvent.activateManagers();
}
if (endMatchEvent != null)
{
- log(LogService.LOG_DEBUG, "Service endmatch event {0} activating managers", new Object[] {endMatchEvent}, null, null, null);
endMatchEvent.activateManagers();
}
}