commit | 1b6a9e93d99af41f0b0567f232c14d5e7135b25c | [log] [tgz] |
---|---|---|
author | David Jencks <djencks@apache.org> | Sat Mar 30 16:58:23 2013 +0000 |
committer | David Jencks <djencks@apache.org> | Sat Mar 30 16:58:23 2013 +0000 |
tree | 71f1643165268facd018244464a8232bd8fb1695 | |
parent | 690d58a05709a04f19686556e8e11013f92e38c4 [diff] |
FELIX-4000 avoid possibility of concurrentModificationException on m_dependencyManagers by never changing it git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1462798 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java index 7f78903..c3fbf30 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -877,7 +877,7 @@ } - void clear() + synchronized void clear() { // for some testing, the activator may be null if ( m_activator != null ) @@ -885,8 +885,6 @@ m_activator.unregisterComponentId( this ); m_activator = null; } - - m_dependencyManagers.clear(); } /**