You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2011/06/24 14:45:17 UTC
svn commit: r1139278 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Author: mcculls
Date: Fri Jun 24 12:45:17 2011
New Revision: 1139278
URL: http://svn.apache.org/viewvc?rev=1139278&view=rev
Log:
FELIX-2722: avoid NPE when project.organization.name is null
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1139278&r1=1139277&r2=1139278&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Fri Jun 24 12:45:17 2011
@@ -937,10 +937,13 @@ public class BundlePlugin extends Abstra
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();