felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r452484 - /incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
Date Tue, 03 Oct 2006 13:19:44 GMT
Author: rickhall
Date: Tue Oct  3 06:19:43 2006
New Revision: 452484

URL: http://svn.apache.org/viewvc?view=rev&rev=452484
Log:
Applied a patch to avoid an NPE.

Modified:
    incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java

Modified: incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java?view=diff&rev=452484&r1=452483&r2=452484
==============================================================================
--- incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
(original)
+++ incubator/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
Tue Oct  3 06:19:43 2006
@@ -560,6 +560,10 @@
         // Get all of the local resolvable requirements for the old
         // version of the resource from the specified resource array.
         Requirement[] reqs = getResolvableRequirements(oldVersion, resources);
+        if (reqs == null)
+        {
+            return true;
+        }
 
         // Now make sure that all of the requirements resolved by the
         // old version of the resource can also be resolved by the new
@@ -623,4 +627,4 @@
         }
         return null;
     }
-}
\ No newline at end of file
+}



Mime
View raw message