From 1af79f79603b8f273f6701224faef5e505fe6c58 Mon Sep 17 00:00:00 2001 From: Nik Bougalis Date: Thu, 15 Jan 2015 04:24:53 -0800 Subject: [PATCH] Properly validate the configured online delete interval --- src/ripple/app/misc/SHAMapStoreImp.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp index 02b51a51a9..804b57ef57 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.cpp +++ b/src/ripple/app/misc/SHAMapStoreImp.cpp @@ -209,15 +209,17 @@ SHAMapStoreImp::SHAMapStoreImp (Setup const& setup, { if (setup_.deleteInterval) { - if (setup_.ledgerHistory > setup_.deleteInterval || - setup_.ledgerHistory < minimumDeletionInterval_) + if (setup_.deleteInterval < minimumDeletionInterval_) { - std::stringstream es; - es << "online_delete (" << setup_.deleteInterval - << ") must be at least " << minimumDeletionInterval_ - << " and cannot be less than LEDGER_HISTORY (" - << setup_.ledgerHistory << ")"; - throw std::runtime_error (es.str()); + throw std::runtime_error ("online_delete must be at least " + + std::to_string (minimumDeletionInterval_)); + } + + if (setup_.ledgerHistory > setup_.deleteInterval) + { + throw std::runtime_error ( + "online_delete must be less than ledger_history (currently " + + std::to_string (setup_.ledgerHistory) + ")"); } state_db_.init (setup_.databasePath, dbName_);