commit 8caf1c4dd2f40e837fa146a10412302e01fccb0b
author Marcel Offermans <marrs@apache.org> Tue Jan 31 08:20:57 2012 +0000
committer Marcel Offermans <marrs@apache.org> Tue Jan 31 08:20:57 2012 +0000
tree 357a8e9c51944dbc8cb40dba8fa757be28f9272d
parent 93edd662b7df2e9c5ffd806fbad36d4692aa5938

FELIX-3243 applied the patch

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1238241 13f79535-47bb-0310-9956-ffa450edef68

deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java

diff --git a/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java b/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
index 523c6e8..5e7135f 100644
--- a/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
+++ b/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
@@ -399,7 +399,7 @@
 
     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 {