Skip to content

FELIX-6812: Fix ConfigInstaller to use listConfigurations instead of getConfiguration #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FELIX-6812: Fix ConfigInstaller to use listConfigurations instead of getConfiguration #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,15 @@ public void doConfigurationEvent(ConfigurationEvent configurationEvent)
{
try
{
Configuration config = getConfigurationAdmin().getConfiguration(
configurationEvent.getPid(),
"?");
Configuration[] configurations = getConfigurationAdmin().listConfigurations("(service.pid=" + configurationEvent.getPid() + ")");
if (null == configurations) {
return;
}
if (configurations.length < 1) {
return;
}
Configuration config = configurations[0];

Dictionary<?,?> dict = config.getProperties();
String fileName = dict != null ? (String) dict.get( DirectoryWatcher.FILENAME ) : null;
File file = fileName != null ? fromConfigKey(fileName) : null;
Expand Down
15 changes: 9 additions & 6 deletions fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ public void testCreateConfigAndObserveCMDeleted() throws Exception
EasyMock.expect(mockBundleContext.getProperty((String) EasyMock.anyObject()))
.andReturn(null)
.anyTimes();
EasyMock.expect(mockConfigurationAdmin.listConfigurations((String) EasyMock.anyObject()))
EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=file:" + file + ")"))
.andReturn(null);
EasyMock.expect(mockConfigurationAdmin.getConfiguration(pid, "?"))
.andReturn(mockConfiguration);
EasyMock.expect(mockConfigurationAdmin.listConfigurations("(service.pid=" + pid + ")"))
.andReturn(new Configuration[] { mockConfiguration });

ServiceReference<ConfigurationAdmin> sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(mockConfiguration.updateIfDifferent(EasyMock.capture(props))).andReturn(true);
Expand Down Expand Up @@ -327,8 +327,8 @@ public void testUseExistingConfigWithFileinstallFilenameAndObserveCMDeleted() th
EasyMock.expect(mockBundleContext.getProperty((String) EasyMock.anyObject()))
.andReturn(null)
.anyTimes();
EasyMock.expect(mockConfigurationAdmin.listConfigurations((String) EasyMock.anyObject()))
.andReturn(null);
EasyMock.expect(mockConfigurationAdmin.listConfigurations("(service.pid=" + pid + ")"))
.andReturn(new Configuration[] { mockConfiguration });
EasyMock.expect(mockConfigurationAdmin.getConfiguration(pid, "?"))
.andReturn(mockConfiguration);
EasyMock.expect(mockConfiguration.getPid())
Expand Down Expand Up @@ -386,14 +386,17 @@ public void testDoConfigurationEventSavesUpdatedConfigurationWhenUsingCachingPer
.andReturn(cachingPersistenceConfiguration)
.anyTimes();

EasyMock.expect(mockConfigurationAdmin.listConfigurations("(service.pid=" + pid + ")"))
.andReturn(new Configuration[] { cachingPersistenceConfiguration });

EasyMock.expect(mockConfigurationAdmin.getConfiguration(pid, null))
.andReturn(cachingPersistenceConfiguration)
.anyTimes();

final Configuration newConfiguration = EasyMock.createMock(Configuration.class);
EasyMock.expect(newConfiguration.getAttributes()).andReturn(Collections.emptySet()).times(2);

EasyMock.expect(mockConfigurationAdmin.listConfigurations((String) EasyMock.anyObject()))
EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=file:" + file + ")"))
.andReturn(new Configuration[] { newConfiguration });

EasyMock.expect(newConfiguration.getProperties())
Expand Down