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 07:28:03 UTC
svn commit: r1809129 - in /felix/trunk/osgi-r7/configadmin/src:
main/java/org/apache/felix/cm/impl/Activator.java
test/java/org/apache/felix/cm/integration/helper/TestListener.java
Author: cziegeler
Date: Thu Sep 21 07:28:02 2017
New Revision: 1809129
URL: http://svn.apache.org/viewvc?rev=1809129&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/test/java/org/apache/felix/cm/integration/helper/TestListener.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=1809129&r1=1809128&r2=1809129&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 07:28:02 2017
@@ -91,7 +91,6 @@ public class Activator implements Bundle
{
configuredPM = null;
}
- configuredPM = "file";
try
{
this.tracker = new PersistenceManagerTracker(bundleContext, defaultPM, configuredPM);
Modified: felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/helper/TestListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/helper/TestListener.java?rev=1809129&r1=1809128&r2=1809129&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/helper/TestListener.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/test/java/org/apache/felix/cm/integration/helper/TestListener.java Thu Sep 21 07:28:02 2017
@@ -19,11 +19,11 @@
package org.apache.felix.cm.integration.helper;
-import junit.framework.TestCase;
-
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.cm.ConfigurationListener;
+import junit.framework.TestCase;
+
public class TestListener implements ConfigurationListener
{
@@ -42,6 +42,7 @@ public class TestListener implements Con
}
+ @Override
public void configurationEvent( final ConfigurationEvent event )
{
this.numberOfEvents++;