Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 99085 invoked from network); 10 Aug 2009 08:28:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Aug 2009 08:28:57 -0000 Received: (qmail 67873 invoked by uid 500); 10 Aug 2009 08:29:04 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 67818 invoked by uid 500); 10 Aug 2009 08:29:04 -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 67809 invoked by uid 99); 10 Aug 2009 08:29:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2009 08:29:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2009 08:29:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2FC17238889C; Mon, 10 Aug 2009 08:28:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090810082840.2FC17238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {