servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eno...@apache.org
Subject svn commit: r749964 - /servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java
Date Wed, 04 Mar 2009 11:18:04 GMT
Author: enolan
Date: Wed Mar  4 11:18:04 2009
New Revision: 749964

URL: http://svn.apache.org/viewvc?rev=749964&view=rev
Log:
SMXKNL-224 - avoid a null pointer exception if no bundle.properties is supplied.

Modified:
    servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java

Modified: servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java?rev=749964&r1=749963&r2=749964&view=diff
==============================================================================
--- servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java
(original)
+++ servicemix/maven-plugins/features-maven-plugin/trunk/src/main/java/org/apache/servicemix/tooling/features/GenerateFeaturesXmlMojo.java
Wed Mar  4 11:18:04 2009
@@ -180,11 +180,11 @@
     /*
      * Read the list of bundles we can use to satisfy links
      */
-    private void readBundles() throws IOException, ArtifactResolutionException, ArtifactNotFoundException
{
-        getLog().info("Step 2 : Building a list of exports for bundles in " + bundles.getAbsolutePath());
+    private void readBundles() throws IOException, ArtifactResolutionException, ArtifactNotFoundException
{        
         BufferedReader reader = null;
         try {
             if (bundles != null) {
+                getLog().info("Step 2 : Building a list of exports for bundles in " + bundles.getAbsolutePath());
                 reader = new BufferedReader(new FileReader(bundles));
                 String line = reader.readLine();
                 while (line != null) {
@@ -195,7 +195,9 @@
                         registerBundle(artifact);
                     }
                     line = reader.readLine();
-                }
+                }                
+            } else {
+                getLog().info("Step 2 : No Bundle file supplied for building list of exports");
             }
         } finally {
             if (reader != null) {



Mime
View raw message