commit e4aa288cf098bf77cc71d5e041216ba7ee0207ba
author Guillaume Nodet <gnodet@apache.org> Fri Dec 14 16:23:38 2012 +0000
committer Guillaume Nodet <gnodet@apache.org> Fri Dec 14 16:23:38 2012 +0000
tree a05be5ff127b2ba09b703b0e56733a10ea0e847a
parent b7d232c291c9888dac23c0449b736895fd452249

[FELIX-3821][FELIX-3822] Fix behavior when ConfigAdmin is unregistered and unregister all services explicitly

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

fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java

diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
index 79fb7b6..3eab719 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/FileInstall.java
@@ -19,16 +19,8 @@
 package org.apache.felix.fileinstall.internal;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.felix.fileinstall.ArtifactInstaller;
 import org.apache.felix.fileinstall.ArtifactListener;
@@ -37,14 +29,7 @@
 import org.apache.felix.fileinstall.internal.Util.Logger;
 import org.apache.felix.utils.collections.DictionaryAsMap;
 import org.apache.felix.utils.properties.InterpolationHelper;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
+import org.osgi.framework.*;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
@@ -72,6 +57,7 @@
     static boolean initialized;
     static final Object barrier = new Object();
     static final Object refreshLock = new Object();
+    ServiceRegistration urlHandlerRegistration;
 
     public void start(BundleContext context) throws Exception
     {
@@ -80,7 +66,7 @@
 
         Hashtable props = new Hashtable();
         props.put("url.handler.protocol", JarDirUrlHandler.PROTOCOL);
-        context.registerService(org.osgi.service.url.URLStreamHandlerService.class.getName(), new JarDirUrlHandler(), props);
+        urlHandlerRegistration = context.registerService(org.osgi.service.url.URLStreamHandlerService.class.getName(), new JarDirUrlHandler(), props);
 
         padmin = new ServiceTracker(context, PackageAdmin.class.getName(), null);
         padmin.open();
@@ -182,6 +168,7 @@
         synchronized (barrier) {
             initialized = false;
         }
+        urlHandlerRegistration.unregister();
         List /*<DirectoryWatcher>*/ toClose = new ArrayList /*<DirectoryWatcher>*/();
         synchronized (watchers)
         {
@@ -386,24 +373,27 @@
     private static class ConfigAdminSupport implements Runnable
     {
         private Tracker tracker;
+        private ServiceRegistration registration;
 
         private ConfigAdminSupport(BundleContext context, FileInstall fileInstall)
         {
             tracker = new Tracker(context, fileInstall);
             Hashtable props = new Hashtable();
             props.put(Constants.SERVICE_PID, tracker.getName());
-            context.registerService(ManagedServiceFactory.class.getName(), tracker, props);
+            registration = context.registerService(ManagedServiceFactory.class.getName(), tracker, props);
             tracker.open();
         }
 
         public void run()
         {
+            registration.unregister();
             tracker.close();
         }
 
         private class Tracker extends ServiceTracker implements ManagedServiceFactory {
 
             private final FileInstall fileInstall;
+            private final Set configs = Collections.synchronizedSet(new HashSet());
             private ConfigInstaller configInstaller;
 
             private Tracker(BundleContext bundleContext, FileInstall fileInstall)
@@ -419,11 +409,13 @@
 
             public void updated(String s, Dictionary dictionary) throws ConfigurationException
             {
+                configs.add(s);
                 fileInstall.updated(s, dictionary);
             }
 
             public void deleted(String s)
             {
+                configs.remove(s);
                 fileInstall.deleted(s);
             }
 
@@ -437,6 +429,12 @@
 
             public void removedService(ServiceReference serviceReference, Object o)
             {
+                Iterator iterator = configs.iterator();
+                while (iterator.hasNext()) {
+                    String s = (String) iterator.next();
+                    fileInstall.deleted(s);
+                    iterator.remove();
+                }
                 if (configInstaller != null)
                 {
                     configInstaller.destroy();