felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r802692 - in /felix/trunk/karaf: deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
Date Mon, 10 Aug 2009 08:28:39 GMT
Author: gnodet
Date: Mon Aug 10 08:28:39 2009
New Revision: 802692

URL: http://svn.apache.org/viewvc?rev=802692&view=rev
Log:
FELIX-1220: Remove unnecssary parts of a filter

Modified:
    felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
    felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java

Modified: felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java?rev=802692&r1=802691&r2=802692&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
(original)
+++ felix/trunk/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
Mon Aug 10 08:28:39 2009
@@ -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 {

Modified: felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java?rev=802692&r1=802691&r2=802692&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
(original)
+++ felix/trunk/karaf/features/core/src/main/java/org/apache/felix/karaf/features/internal/FeaturesServiceImpl.java
Mon Aug 10 08:28:39 2009
@@ -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 {



Mime
View raw message