You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/09/21 05:48:46 UTC

svn commit: r1809121 - in /felix/trunk/osgi-r7/configadmin/src: main/java/org/apache/felix/cm/impl/ main/java/org/apache/felix/cm/impl/persistence/ test/java/org/apache/felix/cm/integration/

Author: cziegeler
Date: Thu Sep 21 05:48:46 2017
New Revision: 1809121

URL: http://svn.apache.org/viewvc?rev=1809121&view=rev
Log:
FELIX-5693 : Improve persistent manager handling

Modified:
    felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/Activator.java
    felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/DynamicBindings.java
    felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java
    felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/WorkerQueue.java
    felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java

Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/Activator.java?rev=1809121&r1=1809120&r2=1809121&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/Activator.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/Activator.java Thu Sep 21 05:48:46 2017
@@ -91,6 +91,7 @@ public class Activator implements Bundle
         {
             configuredPM = null;
         }
+        configuredPM = "file";
         try
         {
             this.tracker = new PersistenceManagerTracker(bundleContext, defaultPM, configuredPM);

Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/DynamicBindings.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/DynamicBindings.java?rev=1809121&r1=1809120&r2=1809121&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/DynamicBindings.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/DynamicBindings.java Thu Sep 21 05:48:46 2017
@@ -39,8 +39,7 @@ class DynamicBindings
 
     private final PersistenceManager persistenceManager;
 
-    private final Dictionary bindings;
-
+    private final Dictionary<String, String> bindings;
 
     DynamicBindings( BundleContext bundleContext, PersistenceManager persistenceManager ) throws IOException
     {
@@ -63,7 +62,7 @@ class DynamicBindings
             for ( Enumeration ke = bindings.keys(); ke.hasMoreElements(); )
             {
                 final String pid = ( String ) ke.nextElement();
-                final String location = ( String ) bindings.get( pid );
+                final String location = bindings.get( pid );
                 if ( !locations.contains( location ) )
                 {
                     removedKeys.add( pid );
@@ -85,7 +84,7 @@ class DynamicBindings
         }
         else
         {
-            this.bindings = new Hashtable();
+            this.bindings = new Hashtable<>();
         }
 
     }
@@ -95,7 +94,7 @@ class DynamicBindings
     {
         synchronized ( this )
         {
-            return ( String ) this.bindings.get( pid );
+            return this.bindings.get( pid );
         }
     }
 

Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java?rev=1809121&r1=1809120&r2=1809121&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java Thu Sep 21 05:48:46 2017
@@ -95,6 +95,7 @@ public class PersistenceManagerTracker
         if ( this.persistenceManagerTracker != null )
         {
             this.workerQueue.stop();
+            this.deactivate();
             this.persistenceManagerTracker.close();
         }
         else
@@ -124,8 +125,11 @@ public class PersistenceManagerTracker
 
     private void deactivate()
     {
-        this.configurationManager.stop();
-        this.configurationManager = null;
+        if ( this.configurationManager != null )
+        {
+            this.configurationManager.stop();
+            this.configurationManager = null;
+        }
         this.stopCoordinatorTracker();
         // update log
         Log.logger.set(null);
@@ -339,8 +343,11 @@ public class PersistenceManagerTracker
 
     private void stopCoordinatorTracker()
     {
-        this.coordinatorTracker.close();
-        this.coordinatorTracker = null;
+        if ( this.coordinatorTracker != null )
+        {
+            this.coordinatorTracker.close();
+            this.coordinatorTracker = null;
+        }
     }
 }
 

Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/WorkerQueue.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/WorkerQueue.java?rev=1809121&r1=1809120&r2=1809121&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/WorkerQueue.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/WorkerQueue.java Thu Sep 21 05:48:46 2017
@@ -30,7 +30,7 @@ public class WorkerQueue implements Runn
 
     private final ThreadFactory threadFactory;
 
-    private final List<Runnable> tasks = new ArrayList<Runnable>();
+    private final List<Runnable> tasks = new ArrayList<>();
 
     private volatile Thread backgroundThread;
 

Modified: felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java?rev=1809121&r1=1809120&r2=1809121&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java Thu Sep 21 05:48:46 2017
@@ -19,6 +19,14 @@
 package org.apache.felix.cm.integration;
 
 
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.workingDirectory;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,18 +37,13 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Set;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import javax.inject.Inject;
 
 import org.apache.felix.cm.integration.helper.BaseTestActivator;
 import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
 import org.apache.felix.cm.integration.helper.UpdateThreadSignalTask;
 import org.junit.After;
 import org.junit.Before;
-
-import javax.inject.Inject;
-
-import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.OptionUtils;
 import org.ops4j.pax.exam.TestProbeBuilder;
@@ -56,7 +59,8 @@ import org.osgi.service.cm.Configuration
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.util.tracker.ServiceTracker;
 
-import static org.ops4j.pax.exam.CoreOptions.*;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
 
 
 public abstract class ConfigurationTestBase
@@ -81,16 +85,16 @@ public abstract class ConfigurationTestB
 
     protected Bundle bundle;
 
-    protected ServiceTracker configAdminTracker;
+    protected ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> configAdminTracker;
 
-    private Set<String> configurations = new HashSet<String>();
+    private Set<String> configurations = new HashSet<>();
 
     protected static final String PROP_NAME = "theValue";
     protected static final Dictionary<String, String> theConfig;
 
     static
     {
-        theConfig = new Hashtable<String, String>();
+        theConfig = new Hashtable<>();
         theConfig.put( PROP_NAME, PROP_NAME );
     }
 
@@ -121,7 +125,7 @@ public abstract class ConfigurationTestB
     @Before
     public void setUp()
     {
-        configAdminTracker = new ServiceTracker( bundleContext, ConfigurationAdmin.class.getName(), null );
+        configAdminTracker = new ServiceTracker<>( bundleContext, ConfigurationAdmin.class, null );
         configAdminTracker.open();
     }
 
@@ -239,14 +243,19 @@ public abstract class ConfigurationTestB
 
     protected Bundle getCmBundle()
     {
-        final ServiceReference caref = configAdminTracker.getServiceReference();
+        final ServiceReference<ConfigurationAdmin> caref = configAdminTracker.getServiceReference();
         return ( caref == null ) ? null : caref.getBundle();
     }
 
 
     protected ConfigurationAdmin getConfigurationAdmin()
     {
-        ConfigurationAdmin ca = ( ConfigurationAdmin ) configAdminTracker.getService();
+        ConfigurationAdmin ca = null;
+        try {
+            ca = configAdminTracker.waitForService(5000L);
+        } catch (InterruptedException e) {
+            // ignore
+        }
         if ( ca == null )
         {
             TestCase.fail( "Missing ConfigurationAdmin service" );