You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Brett Porter <br...@apache.org> on 2006/03/03 23:37:39 UTC
Re: svn commit: r382849 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Can we get unit tests for these types of changes?
- Brett
jdcasey@apache.org wrote:
> Author: jdcasey
> Date: Fri Mar 3 07:08:31 2006
> New Revision: 382849
>
> URL: http://svn.apache.org/viewcvs?rev=382849&view=rev
> Log:
> Fixing NPE in appendPath(..) when calculating '..' path adjustments.
>
> Modified:
> maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
>
> Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
> URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=382849&r1=382848&r2=382849&view=diff
> ==============================================================================
> --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
> +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Fri Mar 3 07:08:31 2006
> @@ -538,10 +538,16 @@
> lastToken = currentToken;
> currentToken = tokens.nextToken();
>
> - if ( "..".equals( currentToken ) )
> + if ( "..".equals( currentToken ) && lastToken != null )
> {
> - // trim the previous path part off...
> - cleanedPath.setLength( cleanedPath.length() - ( lastToken.length() + 1 ) );
> + int cleanedPathLen = cleanedPath.length();
> + int lastTokenLen = lastToken.length();
> +
> + if ( cleanedPathLen > lastTokenLen )
> + {
> + // trim the previous path part off...
> + cleanedPath.setLength( cleanedPath.length() - ( lastToken.length() + 1 ) );
> + }
> }
> else if ( !".".equals( currentToken ) )
> {
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r382849 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Posted by Jason van Zyl <ja...@maven.org>.
Brett Porter wrote:
> Can we get unit tests for these types of changes?
I think we decided coverage should not go down. How about we activate
coverage testing and get the build to fail when it drops. We all need
the reminder because we've all let it drop.
Jason.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org