You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2008/12/19 17:04:09 UTC
svn commit: r728057 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Author: rickhall
Date: Fri Dec 19 08:04:09 2008
New Revision: 728057
URL: http://svn.apache.org/viewvc?rev=728057&view=rev
Log:
Check for null when locking bundles.
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=728057&r1=728056&r2=728057&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 Fri Dec 19 08:04:09 2008
@@ -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();
}