commit a901400b829565f2242bb34c295f5b90498f4cd1
author Carsten Ziegeler <cziegeler@apache.org> Mon Sep 21 07:03:29 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Sep 21 07:03:29 2015 +0000
tree 5adb0640cb68201fa0e22025123620c27b2522ac
parent d117e8327a5b47b08b5ceeab7bc7d6d49442b464

Fix potential NPE in baseline check

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1704224 13f79535-47bb-0310-9956-ffa450edef68

tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java

diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java
index 7be84d4..b4e5e0f 100644
--- a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java
+++ b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java
@@ -28,17 +28,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import aQute.bnd.differ.Baseline;
-import aQute.bnd.differ.Baseline.Info;
-import aQute.bnd.differ.DiffPluginImpl;
-import aQute.bnd.osgi.Instructions;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Processor;
-import aQute.bnd.service.diff.Delta;
-import aQute.bnd.service.diff.Diff;
-import aQute.bnd.version.Version;
-import aQute.service.reporter.Reporter;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -59,6 +48,17 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 
+import aQute.bnd.differ.Baseline;
+import aQute.bnd.differ.Baseline.Info;
+import aQute.bnd.differ.DiffPluginImpl;
+import aQute.bnd.osgi.Instructions;
+import aQute.bnd.osgi.Jar;
+import aQute.bnd.osgi.Processor;
+import aQute.bnd.service.diff.Delta;
+import aQute.bnd.service.diff.Diff;
+import aQute.bnd.version.Version;
+import aQute.service.reporter.Reporter;
+
 /**
  * Abstract BND Baseline check between two bundles.
  */
@@ -512,7 +512,7 @@
         for ( Iterator<ArtifactVersion> versionIterator = versions.iterator(); versionIterator.hasNext(); )
         {
             ArtifactVersion version = versionIterator.next();
-            if ( version.getQualifier().endsWith( "SNAPSHOT" ) )
+            if ( version.getQualifier() != null && version.getQualifier().endsWith( "SNAPSHOT" ) )
             {
                 versionIterator.remove();
             }