You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by si...@apache.org on 2008/08/07 07:07:34 UTC

svn commit: r683505 - /maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

Author: sisbell
Date: Wed Aug  6 22:07:34 2008
New Revision: 683505

URL: http://svn.apache.org/viewvc?rev=683505&view=rev
Log:
Fixed problem with index on new model properties in join.

Modified:
    maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java

Modified: maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=683505&r1=683504&r2=683505&view=diff
==============================================================================
--- maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/shared/branches/sisbell-maven-shared-model-profile/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Wed Aug  6 22:07:34 2008
@@ -121,6 +121,10 @@
         }
 
         int startIndex = modelProperties.indexOf( b.getProperties().get( 0 ) );
+        if(startIndex == -1)
+        {
+            startIndex = modelProperties.indexOf( a.getProperties().get( 0 ) );
+        }
         delete( a );
         delete( b );
 
@@ -130,6 +134,7 @@
         {
             startIndex = 0;
         }
+
         modelProperties.addAll( startIndex, joinedProperties );
 
         List<ModelProperty> deletedProperties = new ArrayList<ModelProperty>();