felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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
{



Mime
View raw message