From 2316fe5bbef2e6bc4fedb7cfd7927c6ccfaa6497 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 27 Nov 2013 09:11:42 -0800 Subject: [PATCH] A better way to return an empty set if the token isn't an object. --- src/ripple_app/misc/NetworkOPs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ripple_app/misc/NetworkOPs.cpp b/src/ripple_app/misc/NetworkOPs.cpp index 5df9db3c72..e8af62ab39 100644 --- a/src/ripple_app/misc/NetworkOPs.cpp +++ b/src/ripple_app/misc/NetworkOPs.cpp @@ -1844,7 +1844,7 @@ NetworkOPsImp::getTxsAccount (const RippleAddress& account, int32 minLedger, int uint32 NONBINARY_PAGE_LENGTH = 200; uint32 EXTRA_LENGTH = 20; - bool foundResume = token.isNull(); + bool foundResume = !token.isObject(); uint32 numberOfResults, queryLimit; if (limit <= 0) @@ -1956,7 +1956,7 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, int32 minLedger, in uint32 BINARY_PAGE_LENGTH = 500; uint32 EXTRA_LENGTH = 20; - bool foundResume = token.isNull(); + bool foundResume = !token.isObject(); uint32 numberOfResults, queryLimit; if (limit <= 0) @@ -1972,7 +1972,7 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, int32 minLedger, in { try { - if (!token.isObject() || !token.isMember("ledger") || !token.isMember("seq")) + if (!token.isMember("ledger") || !token.isMember("seq")) return ret; findLedger = token["ledger"].asInt(); findSeq = token["ledger"].asInt();