You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/03/19 15:13:49 UTC
svn commit: r1579237 -
/felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java
Author: pderop
Date: Wed Mar 19 14:13:49 2014
New Revision: 1579237
URL: http://svn.apache.org/r1579237
Log:
A HashMap can simply be used for the m_dependencyEvents field, since it is only accessed from inside the component executor.
Modified:
felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java?rev=1579237&r1=1579236&r2=1579237&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ComponentImpl.java Wed Mar 19 14:13:49 2014
@@ -1,5 +1,10 @@
package dm.impl;
+import static dm.ComponentState.INACTIVE;
+import static dm.ComponentState.INSTANTIATED_AND_WAITING_FOR_REQUIRED;
+import static dm.ComponentState.TRACKING_OPTIONAL;
+import static dm.ComponentState.WAITING_FOR_REQUIRED;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -8,6 +13,7 @@ import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -23,7 +29,6 @@ import org.osgi.framework.ServiceRegistr
import dm.Component;
import dm.ComponentState;
-import static dm.ComponentState.*;
import dm.ComponentStateListener;
import dm.Dependency;
import dm.DependencyManager;
@@ -57,7 +62,7 @@ public class ComponentImpl implements Co
private final Map m_autoConfigInstance = new ConcurrentHashMap();
private final long m_id;
private static AtomicLong m_idGenerator = new AtomicLong();
- private final Map<DependencyContext, ConcurrentSkipListSet<Event>> m_dependencyEvents = new ConcurrentHashMap<>();
+ private final Map<DependencyContext, ConcurrentSkipListSet<Event>> m_dependencyEvents = new HashMap<>();
// configuration (static)
private volatile String m_callbackInit;