felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r919179 - /felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
Date Thu, 04 Mar 2010 20:57:22 GMT
Author: gnodet
Date: Thu Mar  4 20:57:22 2010
New Revision: 919179

URL: http://svn.apache.org/viewvc?rev=919179&view=rev
Log:
[bundlerepository] fix the NO_LOCAL_RESOURCES flag

Modified:
    felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java

Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java?rev=919179&r1=919178&r2=919179&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
(original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
Thu Mar  4 20:57:22 2010
@@ -208,10 +208,16 @@
 
         // Clean up the resulting data structures.
         m_requiredSet.removeAll(m_addedSet);
-        m_requiredSet.removeAll(Arrays.asList(locals));
+        if ((flags & NO_LOCAL_RESOURCES) == 0)
+        {
+            m_requiredSet.removeAll(Arrays.asList(locals));
+        }
         m_optionalSet.removeAll(m_addedSet);
         m_optionalSet.removeAll(m_requiredSet);
-        m_optionalSet.removeAll(Arrays.asList(locals));
+        if ((flags & NO_LOCAL_RESOURCES) == 0)
+        {
+            m_optionalSet.removeAll(Arrays.asList(locals));
+        }
 
         // Return final result.
         return result;



Mime
View raw message