[KARAF-1797] Do not use equals method on proxies list

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1383262 13f79535-47bb-0310-9956-ffa450edef68

Author: gnodet

features/core/pom.xml

@@ -66,6 +66,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.util</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.junit</artifactId>
@@ -118,7 +123,8 @@
                             org.apache.karaf.features.internal.model,
                             org.apache.karaf.features.management.internal,
                             org.apache.felix.utils.version,
-                            org.apache.felix.utils.manifest
+                            org.apache.felix.utils.manifest,
+                            org.apache.karaf.util.collections
                         </Private-Package>
                     </instructions>
                 </configuration>

features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java

@@ -46,7 +46,6 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -70,6 +69,7 @@
 import org.apache.karaf.features.RepositoryEvent;
 import org.apache.karaf.features.Resolver;
 import org.apache.karaf.region.persist.RegionsPersistence;
+import org.apache.karaf.util.collections.CopyOnWriteArrayIdentityList;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -111,7 +111,7 @@ public class FeaturesServiceImpl implements FeaturesService, FrameworkListener {
     private Map<Feature, Set<Long>> installed = new HashMap<Feature, Set<Long>>();
     private String boot;
     AtomicBoolean bootFeaturesInstalled = new AtomicBoolean();
-    private List<FeaturesListener> listeners = new CopyOnWriteArrayList<FeaturesListener>();
+    private List<FeaturesListener> listeners = new CopyOnWriteArrayIdentityList<FeaturesListener>();
     private Queue<RegionsPersistence> regionsPersistenceQueue = new LinkedList<RegionsPersistence>();
     private CountDownLatch regionsPersistenceLatch = new CountDownLatch(1);
     private ThreadLocal<Repository> repo = new ThreadLocal<Repository>();

jaas/config/pom.xml

@@ -43,6 +43,11 @@
             <artifactId>org.apache.karaf.jaas.boot</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.util</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -100,7 +105,10 @@
                             org.osgi.service.blueprint.reflect,
                             *
                         </Import-Package>
-                        <Private-Package>${project.artifactId}.impl</Private-Package>
+                        <Private-Package>
+                            ${project.artifactId}.impl,
+                            org.apache.karaf.util.collections
+                        </Private-Package>
                     </instructions>
                 </configuration>
             </plugin>

jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java

@@ -18,15 +18,15 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 
 import org.apache.karaf.jaas.config.JaasRealm;
+import org.apache.karaf.util.collections.CopyOnWriteArrayIdentityList;
 
 public class OsgiConfiguration extends Configuration {
 
-    private final List<JaasRealm> realms = new CopyOnWriteArrayList<JaasRealm>();
+    private final List<JaasRealm> realms = new CopyOnWriteArrayIdentityList<JaasRealm>();
 
     public void init() {
         Configuration.setConfiguration(this);

jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiKeystoreManager.java

@@ -20,15 +20,14 @@
 import java.security.SecureRandom;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.apache.karaf.jaas.config.KeystoreInstance;
 import org.apache.karaf.jaas.config.KeystoreIsLocked;
 import org.apache.karaf.jaas.config.KeystoreManager;
+import org.apache.karaf.util.collections.CopyOnWriteArrayIdentityList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +38,7 @@ public class OsgiKeystoreManager implements KeystoreManager {
 
     private final static transient Logger logger = LoggerFactory.getLogger(OsgiKeystoreManager.class);
 
-    private List<KeystoreInstance> keystores = new CopyOnWriteArrayList<KeystoreInstance>();
+    private List<KeystoreInstance> keystores = new CopyOnWriteArrayIdentityList<KeystoreInstance>();
 
     public void register(KeystoreInstance keystore, Map<String, ?> properties) {
         keystores.add(keystore);
@@ -156,4 +155,4 @@ private boolean checkForKeystoresAvailability(String keyStore, String keyAlias,
         return found;
     }
 
-}
+}