You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@aries.apache.org by gn...@apache.org on 2012/05/22 00:44:20 UTC

svn commit: r1341240 - /aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java

Author: gnodet
Date: Mon May 21 22:44:20 2012
New Revision: 1341240

URL: http://svn.apache.org/viewvc?rev=1341240&view=rev
Log:
ARIES-718: Avoid NPEs when getting ClassLoaders for null bundles

Modified:
    aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java

Modified: aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
URL: http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java?rev=1341240&r1=1341239&r2=1341240&view=diff
==============================================================================
--- aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java (original)
+++ aries/branches/blueprint-0.3.2-fixes/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java Mon May 21 22:44:20 2012
@@ -51,7 +51,7 @@ public final class AriesFrameworkUtil 
    */
   public static ClassLoader getClassLoader(Bundle b)
   {
-    if (b.getState() != Bundle.UNINSTALLED && b.getState() != Bundle.INSTALLED) {
+    if (b != null && b.getState() != Bundle.UNINSTALLED && b.getState() != Bundle.INSTALLED) {
       return worker.getClassLoader(b);
     } else {
       return null;
@@ -85,6 +85,8 @@ public final class AriesFrameworkUtil 
    */
   public static ClassLoader getClassLoaderForced(Bundle b)
   {
+    if (b == null)
+      return null;
     try {
       b.loadClass("java.lang.Object");
     } catch (ClassNotFoundException e) {