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/26 23:34:10 UTC
svn commit: r689241 -
/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
Author: sisbell
Date: Tue Aug 26 14:34:10 2008
New Revision: 689241
URL: http://svn.apache.org/viewvc?rev=689241&view=rev
Log:
Bug fix: unmarshaller breaking if tag had attribute property and text was null.
Modified:
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=689241&r1=689240&r2=689241&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java (original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java Tue Aug 26 14:34:10 2008
@@ -237,6 +237,7 @@
{
continue;
}
+
//String val = (mp.getValue() != null) ? "\"" + mp.getValue() + "\"" : null;
// System.out.println("new ModelProperty(\"" + mp.getUri() +"\" , " + val +"),");
if ( !uri.startsWith( baseUri ) )
@@ -273,6 +274,20 @@
sb.append( toEndTag( tag ) );
n = 2;
}
+ else if(attribute != null)
+ {
+ int pi = modelProperties.indexOf( mp ) + 2;
+ if ( pi <= modelProperties.size() - 1 )
+ {
+ ModelProperty peekProperty = modelProperties.get( pi );
+ if ( !peekProperty.getUri().startsWith(mp.getUri()) )
+ {
+ sb.append( mp.getResolvedValue() );
+ sb.append( toEndTag( tag ) );
+ n = 2;
+ }
+ }
+ }
else
{
n = 1;