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/07/15 10:46:47 UTC
svn commit: r676830 -
/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Author: sisbell
Date: Tue Jul 15 01:46:47 2008
New Revision: 676830
URL: http://svn.apache.org/viewvc?rev=676830&view=rev
Log:
Fix: If container property was last in global list, it was not being picked up.
Modified:
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=676830&r1=676829&r2=676830&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java Tue Jul 15 01:46:47 2008
@@ -147,6 +147,9 @@
break;
}
case END_TAG: {
+ if(!i.hasNext()) {
+ tmp.add(mp);
+ }
modelContainers.add(factory.create(tmp));
tmp.clear();
state = NO_TAG;
@@ -254,7 +257,12 @@
List<String> uris = new ArrayList<String>();
String baseUri = a.getProperties().get(0).getUri();
for (ModelProperty p : m) {
- String subUri = p.getUri().substring(baseUri.length(), p.getUri().length());
+ int modelPropertyLength = p.getUri().length();
+ if(baseUri.length() > modelPropertyLength ) {
+ throw new IllegalArgumentException("Base URI is longer than model property uri: Base URI = " + baseUri
+ + ", ModelProperty = " + p);
+ }
+ String subUri = p.getUri().substring(baseUri.length(), modelPropertyLength );
if (!uris.contains(p.getUri())
|| (subUri.contains("#collection") && !subUri.endsWith("#collection"))) {
processedProperties.add(findLastIndexOfParent(p, processedProperties) + 1, p);