[maven-antrun-plugin] 22/26: StringIndexOutOfBoundsException in custom ant task referencing 'basedir' PR: MANTRUN-34 Submitted By: Marcel Schutte

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to annotated tag maven-antrun-plugin-1.1
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git

commit 224ea526d91f1f423c57cd020193d4f1e50b4c2e
Author: Carlos Sanchez Gonzalez <ca...@apache.org>
AuthorDate: Sat Dec 31 18:18:11 2005 +0000

    StringIndexOutOfBoundsException in custom ant task referencing 'basedir'
    PR: MANTRUN-34
    Submitted By: Marcel Schutte
    
    git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-antrun-plugin@360386 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven/plugin/antrun/AntPropertyHelper.java     | 31 +++++++++++++---------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java b/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
index 02abfde..82b487b 100644
--- a/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
+++ b/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
@@ -44,19 +44,24 @@ public class AntPropertyHelper
     {
         log.debug( "getProperty(ns="+ns+", name="+name+", user="+user+")" );
 
+        Object val = null;
         try
         {
-            if ( name.startsWith( "project." ) || name.equals( "basedir" ) )
+            if ( name.startsWith( "project." ) )
             {
-                Object val = ReflectionValueExtractor.evaluate(
-                    name.substring( "project.".length() ),
-                    mavenProject
+                val = ReflectionValueExtractor.evaluate(
+                    name,
+                    mavenProject,
+                    true
+                );
+            }
+            else if ( name.equals("basedir") )
+            {
+                val = ReflectionValueExtractor.evaluate(
+                    "basedir.path",
+                    mavenProject,
+                    false
                 );
-
-                if ( val != null )
-                {
-                    return val;
-                }
             }
         }
         catch ( Exception e )
@@ -65,11 +70,13 @@ public class AntPropertyHelper
             e.printStackTrace();
         }
 
-        Object val = super.getPropertyHook( ns, name, user );
-
         if ( val == null )
         {
-            val = System.getProperty( name.toString() );
+            val = super.getPropertyHook( ns, name, user );
+            if ( val == null )
+            {
+                val = System.getProperty( name.toString() );
+            }
         }
 
         return val;

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.