commit a584d8a6d4d9cfc736aec3a5ce070a290d6e76d5
author Carsten Ziegeler <cziegeler@apache.org> Mon May 24 09:27:03 2021 +0200
committer Carsten Ziegeler <cziegeler@apache.org> Mon May 24 09:27:03 2021 +0200
tree ed8e4638667dc83d3c9bd5f749d6a82e7acb0a68
parent 628793be632b25e3ddd21e64ae4cfaeefb46d5ab

SLING-10414 : NPE in CheckDeprecatedApi.java

src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckDeprecatedApi.java

diff --git a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckDeprecatedApi.java b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckDeprecatedApi.java
index 83847a6..a1cd6a7 100644
--- a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckDeprecatedApi.java
+++ b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckDeprecatedApi.java
@@ -32,6 +32,7 @@
 import org.apache.sling.feature.scanner.BundleDescriptor;
 import org.apache.sling.feature.scanner.PackageInfo;
 import org.osgi.framework.Version;
+import org.osgi.framework.VersionRange;
 
 
 public class CheckDeprecatedApi implements AnalyserTask{
@@ -93,11 +94,12 @@
         for(final BundleDescriptor bd : context.getFeatureDescriptor().getBundleDescriptors()) {
             if ( isInAllowedRegion(bundleRegions.get(bd), region.getName(), allowedNames) ) {
                 for(final PackageInfo pi : bd.getImportedPackages()) {
+                    final VersionRange importRange = pi.getPackageVersionRange();
                     String imports = null;
                     for(final ApiExport exp : exports) {
                         if ( pi.getName().equals(exp.getName()) ) {
                             String version = exp.getProperties().get(PROP_VERSION);
-                            if ( version == null || pi.getPackageVersion() == null || pi.getPackageVersionRange().includes(new Version(version)) ) {
+                            if ( version == null || importRange == null || importRange.includes(new Version(version)) ) {
                                 imports = exp.getDeprecation().getPackageInfo().getMessage();
                                 break;
                             }