ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sanely handle optional fields set to their default values.

Browse Source 
Specify when this is allowed and when it's prohibited.
This commit is contained in:
JoelKatz
2012-11-16 15:11:16 -08:00
parent 7b1540c5fd
commit 8bd212e6bc
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/SerializedObject.cpp
View File

@@ -138,7 +138,7 @@ void STObject::set(const std::vector<SOElement::ptr>& type)
BOOST_FOREACH(const SOElement::ptr& elem, type)
{
mType.push_back(elem);
if (elem->flags == SOE_OPTIONAL)
if (elem->flags != SOE_REQUIRED)
giveObject(makeNonPresentObject(elem->e_field));
else
giveObject(makeDefaultObject(elem->e_field));
@@ -159,12 +159,18 @@ bool STObject::setType(const std::vector<SOElement::ptr> &type)
{
match = true;
newData.push_back(mData.release(it).release());
if ((elem->flags == SOE_DEFAULT) && it->isDefault())
{
cLog(lsWARNING) << "setType( " << getFName().getName() << ") invalid default "
<< elem->e_field.fieldName;
valid = false;
}
break;
}
if (!match)
{
if (elem->flags != SOE_OPTIONAL)
if (elem->flags == SOE_REQUIRED)
{
cLog(lsWARNING) << "setType( " << getFName().getName() << ") invalid missing "
<< elem->e_field.fieldName;