Call setter with Collection argument only after Collection has been

fully populated This closes #266
codehaus-plexus · Dec 30, 2022 · c5ef5eb · c5ef5eb
1 parent 33c8523
commit c5ef5eb
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/...dello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/...dello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java
@@ -718,6 +718,8 @@ private void processField( ModelField field, XmlFieldMetadata xmlFieldMetadata,
 
                     String adder;
 
+                    boolean requireSetter = false;
+
                     if ( wrappedItems )
                     {
                         sc.add( tagComparison );
@@ -738,7 +740,7 @@ private void processField( ModelField field, XmlFieldMetadata xmlFieldMetadata,
                             }
                             sc.add( associationType + " " + associationName + " = " + defaultValue + ";" );
 
-                            sc.add( objectName + ".set" + capFieldName + "( " + associationName + " );" );
+                            requireSetter = true;
 
                             adder = associationName + ".add";
                         }
@@ -792,8 +794,8 @@ private void processField( ModelField field, XmlFieldMetadata xmlFieldMetadata,
 
                             sc.add( associationName + " = " + defaultValue + ";" );
 
-                            sc.add( objectName + ".set" + capFieldName + "( " + associationName + " );" );
-
+                            requireSetter = true;
+                            
                             sc.unindent();
                             sc.add( "}" );
 
@@ -851,15 +853,14 @@ private void processField( ModelField field, XmlFieldMetadata xmlFieldMetadata,
 
                         sc.unindent();
                         sc.add( "}" );
-
-                        sc.unindent();
-                        sc.add( "}" );
                     }
-                    else
+                    if (requireSetter)
                     {
-                        sc.unindent();
-                        sc.add( "}" );
+                        sc.add( objectName + ".set" + capFieldName + "( " + associationName + " );" );
                     }
+                    sc.unindent();
+                    sc.add( "}" );
+
                 }
                 else
                 {