cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project MavenProject.java

[brett]

brett       2005/04/20 17:49:19

  Modified:    maven-core/src/main/java/org/apache/maven/plugin
                        PluginParameterExpressionEvaluator.java
               maven-core/src/main/java/org/apache/maven/project
                        MavenProject.java
  Log:
  avoid NPE when there is no project file
  
  Revision  Changes    Path
  1.16      +2 -2      
maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
  
  Index: PluginParameterExpressionEvaluator.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PluginParameterExpressionEvaluator.java   15 Apr 2005 05:29:00 -0000      
1.15
  +++ PluginParameterExpressionEvaluator.java   21 Apr 2005 00:49:19 -0000      
1.16
  @@ -112,7 +112,7 @@
           }
           else if ( expression.equals( "#basedir" ) )
           {
  -            value = 
context.getProject().getFile().getParentFile().getAbsolutePath();
  +            value = context.getProject().getBasedir().getAbsolutePath();
           }
           else if ( expression.startsWith( "#basedir" ) )
           {
  
  
  
  1.44      +8 -1      
maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
  
  Index: MavenProject.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- MavenProject.java 20 Apr 2005 16:48:11 -0000      1.43
  +++ MavenProject.java 21 Apr 2005 00:49:19 -0000      1.44
  @@ -132,7 +132,14 @@
   
       public File getBasedir()
       {
  -        return getFile().getParentFile();
  +        if ( getFile() != null )
  +        {
  +            return getFile().getParentFile();
  +        }
  +        else
  +        {
  +            return new File( System.getProperty( "user.dir" ) );
  +        }
       }
   
       public void setDependencies( List denpendencies )
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]