svn commit: r681856 - /maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

[jdcasey]

Author: jdcasey
Date: Fri Aug  1 14:54:23 2008
New Revision: 681856

URL: http://svn.apache.org/viewvc?rev=681856&view=rev
Log:
make sure direct project in use always has its concrete state calculated.

Modified:
    
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=681856&r1=681855&r2=681856&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
 (original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
 Fri Aug  1 14:54:23 2008
@@ -130,6 +130,8 @@
     public Object evaluate( String expr )
         throws ExpressionEvaluationException
     {
+        calculateConcreteState( project );
+        
         Object value = null;
 
         if ( expr == null )
@@ -213,8 +215,7 @@
         }
         else if ( "project".equals( expression ) )
         {
-            calculateConcreteState( project );
-            
+            // concrete state calculated above for the direct project.
             value = project;
         }
         else if ( "executedProject".equals( expression ) )
@@ -224,8 +225,7 @@
         }
         else if ( expression.startsWith( "project" ) )
         {
-            calculateConcreteState( project );
-            
+            // concrete state calculated above for the direct project.
             try
             {
                 int pathSeparator = expression.indexOf( "/" );
@@ -379,7 +379,7 @@
     private void calculateConcreteState( MavenProject project )
         throws ExpressionEvaluationException
     {
-        if ( projectBuilder != null && !project.isConcrete() )
+        if ( projectBuilder != null && project != null && 
!project.isConcrete() )
         {
             try
             {