When explicitly having <default-value> tag, but no value is given:
<default-value></default-value>, set NULL to attrDefaultValue.
---
src/imm/immloadd/imm_loader.cc | 3 ++-
src/imm/tools/imm_import.cc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/imm/immloadd/imm_loader.cc b/src/imm/immloadd/imm_loader.cc
index de5a575e9..ad9785e92 100644
--- a/src/imm/immloadd/imm_loader.cc
+++ b/src/imm/immloadd/imm_loader.cc
@@ -1909,7 +1909,8 @@ void addClassAttributeDefinition(
attrDefinition.attrFlags = attrFlags;
/* Set the default value */
- if (attrDefaultValueBuffer) {
+ if (attrDefaultValueBuffer &&
+ (strlen(reinterpret_cast<char*>(attrDefaultValueBuffer)) > 0)) {
charsToValueHelper(&attrDefinition.attrDefaultValue, attrValueType,
(const char *)attrDefaultValueBuffer);
} else {
diff --git a/src/imm/tools/imm_import.cc b/src/imm/tools/imm_import.cc
index e2bdcba5c..8145ec572 100644
--- a/src/imm/tools/imm_import.cc
+++ b/src/imm/tools/imm_import.cc
@@ -2444,7 +2444,8 @@ static void addClassAttributeDefinition(ParserState
*state) {
}
/* Set the default value */
- if (state->attrDefaultValueSet) {
+ if (state->attrDefaultValueSet &&
+ (strlen(reinterpret_cast<char*>(state->attrDefaultValueBuffer)) > 0)) {
if (charsToValueHelper(&attrDefinition.attrDefaultValue,
state->attrValueType, state->attrDefaultValueBuffer,
state->strictParse)) {
--
2.18.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
