summaryrefslogtreecommitdiffstats
path: root/src/com/ibm/ServerWizard2/model/AttributeValueSimple.java
diff options
context:
space:
mode:
authornjames <nkskjames@gmail.com>2017-06-20 17:18:09 -0500
committernjames <nkskjames@gmail.com>2017-06-20 17:18:09 -0500
commit0634085b1f4d65e8387f7ca8e45cc06ac59ee905 (patch)
treedc008e1522bda89df800167ff99f17570157f939 /src/com/ibm/ServerWizard2/model/AttributeValueSimple.java
parent60c8e10cbb11768cd1ba394b35cb1d6627efec42 (diff)
downloadserverwiz-0634085b1f4d65e8387f7ca8e45cc06ac59ee905.tar.gz
serverwiz-0634085b1f4d65e8387f7ca8e45cc06ac59ee905.zip
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.
Diffstat (limited to 'src/com/ibm/ServerWizard2/model/AttributeValueSimple.java')
-rw-r--r--src/com/ibm/ServerWizard2/model/AttributeValueSimple.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/ibm/ServerWizard2/model/AttributeValueSimple.java b/src/com/ibm/ServerWizard2/model/AttributeValueSimple.java
index 434efb2..50b2a71 100644
--- a/src/com/ibm/ServerWizard2/model/AttributeValueSimple.java
+++ b/src/com/ibm/ServerWizard2/model/AttributeValueSimple.java
@@ -62,7 +62,10 @@ public class AttributeValueSimple extends AttributeValue {
}
public void readInstanceXML(Element e) {
- field.value = SystemModel.getElement(e, "default");
+ String v = SystemModel.getElement(e, "default");
+ if (!v.isEmpty() || field.value.isEmpty()) {
+ field.value = v;
+ }
}
@Override
OpenPOWER on IntegriCloud