felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r1306979 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Date Thu, 29 Mar 2012 16:46:06 GMT
Author: rickhall
Date: Thu Mar 29 16:46:06 2012
New Revision: 1306979

URL: http://svn.apache.org/viewvc?rev=1306979&view=rev
Log:
Check for null in bundle array for refresh packages. (FELIX-3413)

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1306979&r1=1306978&r2=1306979&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Mar 29 16:46:06
2012
@@ -3891,11 +3891,16 @@ public class Felix extends BundleImpl im
             bundles = new HashSet<Bundle>();
             for (Bundle target : newTargets)
             {
-                // Add the current target bundle to the map of
-                // bundles to be refreshed.
-                bundles.add(target);
-                // Add all importing bundles to map.
-                populateDependentGraph((BundleImpl) target, bundles);
+                // If anyone passes in a null bundle, then just
+                // ignore it.
+                if (target != null)
+                {
+                    // Add the current target bundle to the map of
+                    // bundles to be refreshed.
+                    bundles.add(target);
+                    // Add all importing bundles to map.
+                    populateDependentGraph((BundleImpl) target, bundles);
+                }
             }
         }
 



Mime
View raw message