svn commit: r1581862 - in /felix/trunk/framework/src/main/java/org/apache/felix/framework: BundleRevisionImpl.java BundleWiringImpl.java

[ri...@apache.org]

Author: rickhall
Date: Wed Mar 26 14:26:11 2014
New Revision: 1581862

URL: http://svn.apache.org/r1581862
Log:
Add back an internal method to return fragments associated with a wiring
to avoid out-of-order parallel array issue. (FELIX-3701)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
    felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java?rev=1581862&r1=1581861&r2=1581862&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Wed Mar 26 14:26:11 2014
@@ -371,7 +371,11 @@ public class BundleRevisionImpl implemen
         List<Content> fragmentContents = null;
         if (m_wiring != null)
         {
-            fragments = Util.getFragments(m_wiring);
+            // Get fragments and their contents from the wiring.
+            // Note that we don't use Util.getFragments() here because
+            // the wiring returns parallel arrays and the utility method
+            // doesn't necessarily return the correct order.
+            fragments = m_wiring.getFragments();
             fragmentContents = m_wiring.getFragmentContents();
         }
         if (fragments != null)

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1581862&r1=1581861&r2=1581862&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Wed Mar 26 14:26:11 2014
@@ -501,6 +501,11 @@ public class BundleWiringImpl implements
         return m_importedPkgs.get(pkgName);
     }
 
+    List<BundleRevision> getFragments()
+    {
+        return m_fragments;
+    }
+
     List<Content> getFragmentContents()
     {
         return m_fragmentContents;