diff options
| author | njames <nkskjames@gmail.com> | 2017-06-20 17:18:09 -0500 |
|---|---|---|
| committer | njames <nkskjames@gmail.com> | 2017-06-20 17:18:09 -0500 |
| commit | 0634085b1f4d65e8387f7ca8e45cc06ac59ee905 (patch) | |
| tree | dc008e1522bda89df800167ff99f17570157f939 /src/com | |
| parent | 60c8e10cbb11768cd1ba394b35cb1d6627efec42 (diff) | |
| download | serverwiz-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')
| -rw-r--r-- | src/com/ibm/ServerWizard2/model/AttributeValueNative.java | 5 | ||||
| -rw-r--r-- | src/com/ibm/ServerWizard2/model/AttributeValueSimple.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/ibm/ServerWizard2/model/AttributeValueNative.java b/src/com/ibm/ServerWizard2/model/AttributeValueNative.java index df8688e..7ac85d3 100644 --- a/src/com/ibm/ServerWizard2/model/AttributeValueNative.java +++ b/src/com/ibm/ServerWizard2/model/AttributeValueNative.java @@ -26,7 +26,10 @@ public class AttributeValueNative 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 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 |
