Author: pauls
Date: Wed Jul 11 07:58:35 2007
New Revision: 555293
URL: http://svn.apache.org/viewvc?view=rev&rev=555293
Log:
Apply patch to fix a NPE in manifest goal (FELIX-326).
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?view=diff&rev=555293&r1=555292&r2=555293
==============================================================================
---
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
(original)
+++
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
Wed Jul 11 07:58:35 2007
@@ -111,9 +111,12 @@
if ( project.getArtifact().getFile() == null )
{
- throw new NullPointerException( "Artifact file is null" );
+ analyzer.setJar( getOutputDirectory() );
+ }
+ else
+ {
+ analyzer.setJar( project.getArtifact().getFile() );
}
- analyzer.setJar( project.getArtifact().getFile() );
if ( classpath != null )
analyzer.setClasspath( classpath );