| commit | 6f3c60b32b6eee1f6f59b9a70850fa1965f2a8d1 | [log] [tgz] |
|---|---|---|
| author | Guillaume Nodet <gnodet@apache.org> | Mon Aug 10 08:28:39 2009 +0000 |
| committer | Guillaume Nodet <gnodet@apache.org> | Mon Aug 10 08:28:39 2009 +0000 |
| tree | 2dc44372f913bbd3b14fd2fe970edcc40bd4770a | |
| parent | c0f02cae3daddafd981a84322a8f37e03ac6257e [diff] |
FELIX-1220: Remove unnecssary parts of a filter git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@802692 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java index f49b6a8..f12ac05 100644 --- a/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java +++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
@@ -488,9 +488,7 @@ InvalidSyntaxException { ConfigurationAdmin configurationAdmin = activator.getConfigurationAdmin(); if (factoryPid != null) { - Configuration[] configs = configurationAdmin.listConfigurations("(|(" + ALIAS_KEY + "=" + pid - + ")(.alias_factory_pid=" - + factoryPid + "))"); + Configuration[] configs = configurationAdmin.listConfigurations("(" + ALIAS_KEY + "=" + factoryPid + ")"); if (configs == null || configs.length == 0) { return configurationAdmin.createFactoryConfiguration(pid, null); } else {
diff --git a/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java b/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java index 935c0f9..52e8a42 100644 --- a/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java +++ b/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
@@ -432,7 +432,7 @@ protected Configuration getConfiguration(ConfigurationAdmin configurationAdmin, String pid, String factoryPid) throws IOException, InvalidSyntaxException { if (factoryPid != null) { - Configuration[] configs = configurationAdmin.listConfigurations("(|(" + ALIAS_KEY + "=" + pid + ")(.alias_factory_pid=" + factoryPid + "))"); + Configuration[] configs = configurationAdmin.listConfigurations("(" + ALIAS_KEY + "=" + factoryPid + ")"); if (configs == null || configs.length == 0) { return configurationAdmin.createFactoryConfiguration(pid, null); } else {