| commit | 6d0310ea963ffc13786c5019db9cfa91728ef9b0 | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Tue Oct 03 13:19:43 2006 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Tue Oct 03 13:19:43 2006 +0000 |
| tree | d8abdffef4459b1ea59b6128398959cd3227e941 | |
| parent | c6066e1f793de362a4e825bd8114035951155522 [diff] |
Applied a patch to avoid an NPE. git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@452484 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java index f0df777..c096097 100644 --- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java +++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
@@ -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 +}