You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/03/04 21:57:22 UTC
svn commit: r919179 -
/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
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;