Check for null when locking bundles.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@728057 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index e4567e1..adbbc8a 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -4373,7 +4373,7 @@
// Lock all needed bundles; this is not strictly
// necessary since we hold the global lock.
- for (int i = 0; i < bundles.length; i++)
+ for (int i = 0; (bundles != null) && (i < bundles.length); i++)
{
bundles[i].getInfo().lock();
}
@@ -4480,7 +4480,7 @@
// Lock all needed bundles; this is not strictly
// necessary since we hold the global lock.
- for (int i = 0; i < bundles.length; i++)
+ for (int i = 0; (bundles != null) && (i < bundles.length); i++)
{
bundles[i].getInfo().lock();
}