Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing NPE in appendPath(..) when calculating '..' path adjustments. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382849 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2006-03-03 15:08:31 +00:00
parent aaaf6537f6
commit 138d77d3b0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -538,10 +538,16 @@ public class DefaultModelInheritanceAssembler
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 ) )
{