commit c6fb5bb2ef3f0e958b7cd68a36aabd9fe3c0bab1
author Stuart McCulloch <mcculls@apache.org> Fri Jun 24 12:45:17 2011 +0000
committer Stuart McCulloch <mcculls@apache.org> Fri Jun 24 12:45:17 2011 +0000
tree e7a08eae25021b62a6665ecbda88c2f0c1fc3b91
parent 7dda41ea3808302e535419a908381b6491514362

FELIX-2722: avoid NPE when project.organization.name is null

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

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 084d55c..7a43d2c 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -937,10 +937,13 @@
 
         if ( currentProject.getOrganization() != null )
         {
-            String organizationName = currentProject.getOrganization().getName();
-            header( properties, Analyzer.BUNDLE_VENDOR, organizationName );
-            properties.put( "project.organization.name", organizationName );
-            properties.put( "pom.organization.name", organizationName );
+            if ( currentProject.getOrganization().getName() != null )
+            {
+                String organizationName = currentProject.getOrganization().getName();
+                header( properties, Analyzer.BUNDLE_VENDOR, organizationName );
+                properties.put( "project.organization.name", organizationName );
+                properties.put( "pom.organization.name", organizationName );
+            }
             if ( currentProject.getOrganization().getUrl() != null )
             {
                 String organizationUrl = currentProject.getOrganization().getUrl();