From 4e1f0c2c60207b587003d67f0c8584c31db67e78 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sun, 10 Feb 2013 02:26:43 -0800 Subject: [PATCH] Fix RPC account_info to return actNotFound as appropriate. --- src/cpp/ripple/RPCHandler.cpp | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index 6b532815d..55ff10a56 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -585,27 +585,24 @@ Json::Value RPCHandler::doAccountInfo(Json::Value jvRequest) // Get info on account. - Json::Value jAccepted = accountFromString(lpLedger, naAccount, bIndex, strIdent, iIndex); + Json::Value jvAccepted = accountFromString(lpLedger, naAccount, bIndex, strIdent, iIndex); - if (jAccepted.empty()) + if (!jvAccepted.empty()) + return jvAccepted; + + AccountState::pointer asAccepted = mNetOps->getAccountState(lpLedger, naAccount); + + if (asAccepted) { - AccountState::pointer asAccepted = mNetOps->getAccountState(lpLedger, naAccount); + asAccepted->addJson(jvAccepted); - if (asAccepted) - asAccepted->addJson(jAccepted); + jvResult["account_data"] = jvAccepted; + } + else + { + jvResult = rpcError(rpcACT_NOT_FOUND); } - jvResult["account_data"] = jAccepted; - -#if 0 - if (!jAccepted && !asCurrent) - { - jvResult["account"] = naAccount.humanAccountID(); - jvResult["status"] = "NotFound"; - if (bIndex) - jvResult["account_index"] = iIndex; - } -#endif return jvResult; }