You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by jb...@apache.org on 2020/07/18 06:10:10 UTC
[felix-dev] branch master updated: [FELIX-6290][FELIX-6103] Avoid
binding config to a bundle
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new c019478 [FELIX-6290][FELIX-6103] Avoid binding config to a bundle
c019478 is described below
commit c01947853fdc93b8a01c8a0a55a40ed52143c9b7
Author: jbonofre <jb...@apache.org>
AuthorDate: Sat Jul 18 08:09:24 2020 +0200
[FELIX-6290][FELIX-6103] Avoid binding config to a bundle
---
.../java/org/apache/felix/fileinstall/internal/ConfigInstaller.java | 2 +-
.../java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
index 0a70352..9cd812b 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
@@ -366,7 +366,7 @@ public class ConfigInstaller implements ArtifactInstaller, ConfigurationListener
{
Configuration oldConfiguration = findExistingConfiguration(fileName);
Configuration cachedConfiguration = oldConfiguration != null ?
- getConfigurationAdmin().getConfiguration(oldConfiguration.getPid()) : null;
+ getConfigurationAdmin().getConfiguration(oldConfiguration.getPid(), null) : null;
if (cachedConfiguration != null)
{
return cachedConfiguration;
diff --git a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
index 3228ece..5878026 100644
--- a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
+++ b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
@@ -359,7 +359,7 @@ public class ConfigInstallerTest extends TestCase {
.andReturn(cachingPersistenceConfiguration)
.anyTimes();
- EasyMock.expect(mockConfigurationAdmin.getConfiguration(pid))
+ EasyMock.expect(mockConfigurationAdmin.getConfiguration(pid, null))
.andReturn(cachingPersistenceConfiguration)
.anyTimes();