Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DABBE200D08 for ; Thu, 21 Sep 2017 09:28:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D92681609E4; Thu, 21 Sep 2017 07:28:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2B6011609B8 for ; Thu, 21 Sep 2017 09:28:07 +0200 (CEST) Received: (qmail 35070 invoked by uid 500); 21 Sep 2017 07:28:06 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 35061 invoked by uid 99); 21 Sep 2017 07:28:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Sep 2017 07:28:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2F99B3A0223 for ; Thu, 21 Sep 2017 07:28:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 21 Sep 2017 07:28:03 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170921072805.2F99B3A0223@svn01-us-west.apache.org> archived-at: Thu, 21 Sep 2017 07:28:08 -0000 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++;