[maven-debian-helper] 01/03: Fixed a NPE when no relocation is specified

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-debian-helper.

commit 4c77b032f422bb9fbe100a015c341e2b871c26dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 30 16:21:17 2016 +0200

    Fixed a NPE when no relocation is specified
---
 .../main/java/org/debian/maven/plugin/SysInstallMojo.java  | 14 ++++++++------
 debian/changelog                                           |  7 +++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
index 9c18572..cacf394 100644
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
@@ -798,14 +798,16 @@ public class SysInstallMojo extends AbstractMojo {
      * Install the relocated poms
      */
     protected void relocatePoms() throws IOException {
-        for (Dependency relocated : relocatedArtifacts) {
-            getLog().info("Relocating " + relocated.formatCompactNotation());
+        if (relocatedArtifacts != null) {
+            for (Dependency relocated : relocatedArtifacts) {
+                getLog().info("Relocating " + relocated.formatCompactNotation());
 
-            File relocatedPath = new File(packagePath() + "/usr/share/maven-repo" + artifactPath(relocated.getGroupId(), relocated.getArtifactId(), relocated.getVersion()));
-            File relocatedPom = new File(relocatedPath, pomName(relocated.getArtifactId(), relocated.getVersion()));
-            String pom = createRelocationPom(relocated);
+                File relocatedPath = new File(packagePath() + "/usr/share/maven-repo" + artifactPath(relocated.getGroupId(), relocated.getArtifactId(), relocated.getVersion()));
+                File relocatedPom = new File(relocatedPath, pomName(relocated.getArtifactId(), relocated.getVersion()));
+                String pom = createRelocationPom(relocated);
 
-            FileUtils.copyStreamToFile(new RawInputStreamFacade(new ByteArrayInputStream(pom.getBytes("UTF-8"))), relocatedPom);
+                FileUtils.copyStreamToFile(new RawInputStreamFacade(new ByteArrayInputStream(pom.getBytes("UTF-8"))), relocatedPom);
+            }
         }
     }
 
diff --git a/debian/changelog b/debian/changelog
index 811f721..f7a5b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-debian-helper (2.2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed a NPE when no relocation is specified
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 30 Jun 2016 16:20:45 +0200
+
 maven-debian-helper (2.1) unstable; urgency=medium
 
   * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git