You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/10/29 10:40:41 UTC
karaf git commit: Avoid NPE
Repository: karaf
Updated Branches:
refs/heads/master 254f01a46 -> 04cefb6ce
Avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/04cefb6c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/04cefb6c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/04cefb6c
Branch: refs/heads/master
Commit: 04cefb6ce06a8809977b1fb62405be5b20dc8a43
Parents: 254f01a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Oct 29 10:36:34 2015 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Oct 29 10:40:35 2015 +0100
----------------------------------------------------------------------
.../karaf/tooling/features/ExportFeatureMetaDataMojo.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/04cefb6c/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
index 7c00462..032a2f7 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java
@@ -19,7 +19,6 @@ package org.apache.karaf.tooling.features;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -144,8 +143,11 @@ public class ExportFeatureMetaDataMojo extends AbstractFeatureMojo {
resolveArtifact(artifact, remoteRepos);
}
try (JarInputStream jis = new JarInputStream(new FileInputStream(artifact.getFile()))) {
- attributes = jis.getManifest().getMainAttributes();
- manifests.put(bundle.getLocation(), attributes);
+ Manifest manifest = jis.getManifest();
+ if (manifest != null) {
+ attributes = manifest.getMainAttributes();
+ manifests.put(bundle.getLocation(), attributes);
+ }
} catch (IOException e) {
throw new MojoExecutionException("Error reading bundle manifest from " + bundle.getLocation(), e);
}