Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C6949D6D for ; Tue, 31 Jan 2012 08:21:35 +0000 (UTC) Received: (qmail 84947 invoked by uid 500); 31 Jan 2012 08:21:35 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 84748 invoked by uid 500); 31 Jan 2012 08:21:24 -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 84739 invoked by uid 99); 31 Jan 2012 08:21:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jan 2012 08:21:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 31 Jan 2012 08:21:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4FA82388860 for ; Tue, 31 Jan 2012 08:20:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1238241 - /felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java Date: Tue, 31 Jan 2012 08:20:57 -0000 To: commits@felix.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120131082057.C4FA82388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Tue Jan 31 08:20:57 2012 New Revision: 1238241 URL: http://svn.apache.org/viewvc?rev=1238241&view=rev Log: FELIX-3243 applied the patch Modified: felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java Modified: felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java?rev=1238241&r1=1238240&r2=1238241&view=diff ============================================================================== --- felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java (original) +++ felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java Tue Jan 31 08:20:57 2012 @@ -399,7 +399,7 @@ public class AutoConfResourceProcessor i private boolean isFactoryConfig(Designate designate) { String factoryPid = designate.getFactoryPid(); - return (factoryPid != null || !"".equals(factoryPid)); + return (factoryPid != null && !"".equals(factoryPid)); } private Bundle getBundle(String bundleLocation, boolean isFactory) throws ResourceProcessorException {