Skip to content

Commit 0634085

Browse files
committed
Default attribute value overwritten by target type
If target_type default attribute was blank, it was overwriting attribute_type default value. this fix checks for a non-empty default value before assigning to children.
1 parent 60c8e10 commit 0634085

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/com/ibm/ServerWizard2/model/AttributeValueNative.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public void readXML(Element e) {
2626
}
2727

2828
public void readInstanceXML(Element e) {
29-
field.value = SystemModel.getElement(e, "default");
29+
String v = SystemModel.getElement(e, "default");
30+
if (!v.isEmpty() || field.value.isEmpty()) {
31+
field.value = v;
32+
}
3033
}
3134

3235
@Override

src/com/ibm/ServerWizard2/model/AttributeValueSimple.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ public void readXML(Element e) {
6262
}
6363

6464
public void readInstanceXML(Element e) {
65-
field.value = SystemModel.getElement(e, "default");
65+
String v = SystemModel.getElement(e, "default");
66+
if (!v.isEmpty() || field.value.isEmpty()) {
67+
field.value = v;
68+
}
6669
}
6770

6871
@Override

0 commit comments

Comments
 (0)