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

[rickhall]

Author: rickhall
Date: Fri Jul  1 13:59:21 2011
New Revision: 1141942

URL: http://svn.apache.org/viewvc?rev=1141942&view=rev
Log:
Avoid using null caps/reqs. (FELIX-2950)

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=1141942&r1=1141941&r2=1141942&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
 Fri Jul  1 13:59:21 2011
@@ -139,7 +139,7 @@ public class BundleRevisionImpl implemen
         // system bundle directly later on.
         m_manifestVersion = mp.getManifestVersion();
         m_version = mp.getBundleVersion();
-        m_declaredCaps = mp.isExtension() ? null : mp.getCapabilities();
+        m_declaredCaps = mp.isExtension() ? Collections.EMPTY_LIST : 
mp.getCapabilities();
         m_declaredReqs = mp.getRequirements();
         m_declaredNativeLibs = mp.getLibraries();
         m_declaredActivationPolicy = mp.getActivationPolicy();

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=1141942&r1=1141941&r2=1141942&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
 Fri Jul  1 13:59:21 2011
@@ -182,9 +182,8 @@ public class BundleWiringImpl implements
         m_fragments = fragments;
         m_fragmentContents = fragmentContents;
 
-        List<BundleCapability> capList = 
(m_revision.getDeclaredCapabilities(null) == null)
-            ? new ArrayList<BundleCapability>()
-            : new 
ArrayList<BundleCapability>(m_revision.getDeclaredCapabilities(null));
+        List<BundleCapability> capList =
+            new 
ArrayList<BundleCapability>(m_revision.getDeclaredCapabilities(null));
         for (int fragIdx = 0;
             (m_fragments != null) && (fragIdx < m_fragments.size());
             fragIdx++)
@@ -204,8 +203,8 @@ public class BundleWiringImpl implements
         }
         m_resolvedCaps = Collections.unmodifiableList(capList);
 
-        List<BundleRequirement> reqList = 
(m_revision.getDeclaredRequirements(null) == null)
-            ? new ArrayList() : new 
ArrayList(m_revision.getDeclaredRequirements(null));
+        List<BundleRequirement> reqList =
+            new ArrayList(m_revision.getDeclaredRequirements(null));
         for (int fragIdx = 0;
             (m_fragments != null) && (fragIdx < m_fragments.size());
             fragIdx++)