svn commit: r382862 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

[jdcasey]

Author: jdcasey
Date: Fri Mar  3 07:29:21 2006
New Revision: 382862

URL: http://svn.apache.org/viewcvs?rev=382862&view=rev
Log:
(merged from 382861.) Fixed one more place where string manipulation could be 
thwarted by zero-length paths in appendPath(..).

Modified:
    
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=382862&r1=382861&r2=382862&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Fri Mar  3 07:29:21 2006
@@ -482,6 +482,7 @@
         return repository;
     }
 
+    // TODO: This should eventually be migrated to DefaultPathTranslator.
     protected String appendPath( String parentPath, String childPath, String 
pathAdjustment, boolean appendPaths )
     {
         List pathFragments = new ArrayList();
@@ -570,7 +571,12 @@
         
         if ( appendPaths && lastPathPart != null && !lastPathPart.endsWith( 
"/" ) )
         {
-            cleanedPath.setLength( cleanedPath.length() - 1 );
+            int cleanedPathLen = cleanedPath.length();
+            
+            if ( cleanedPathLen > 0 )
+            {
+                cleanedPath.setLength( cleanedPathLen - 1 );
+            }            
         }
 
         return cleanedPath.toString();