mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Compare commits
2 Commits
3.0.0-b1
...
a1q123456/
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28f3d16ff1 | ||
|
|
5a8b23519c |
@@ -36,7 +36,7 @@ namespace BuildInfo {
|
|||||||
// and follow the format described at http://semver.org/
|
// and follow the format described at http://semver.org/
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// clang-format off
|
// clang-format off
|
||||||
char const* const versionString = "3.0.0-b1"
|
char const* const versionString = "2.6.1"
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
#if defined(DEBUG) || defined(SANITIZER)
|
#if defined(DEBUG) || defined(SANITIZER)
|
||||||
|
|||||||
@@ -29,6 +29,8 @@
|
|||||||
#include <xrpl/beast/container/aged_unordered_map.h>
|
#include <xrpl/beast/container/aged_unordered_map.h>
|
||||||
#include <xrpl/protocol/PublicKey.h>
|
#include <xrpl/protocol/PublicKey.h>
|
||||||
|
|
||||||
|
#include "xrpld/shamap/SHAMapMissingNode.h"
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
@@ -386,8 +388,18 @@ private:
|
|||||||
{
|
{
|
||||||
for (auto it = acquiring_.begin(); it != acquiring_.end();)
|
for (auto it = acquiring_.begin(); it != acquiring_.end();)
|
||||||
{
|
{
|
||||||
if (std::optional<Ledger> ledger =
|
std::optional<Ledger> ledger;
|
||||||
adaptor_.acquire(it->first.second))
|
try
|
||||||
|
{
|
||||||
|
// Skip if we haven't finished acquiring this ledger,
|
||||||
|
// or the ledger we acquired isn't complete, which can happen
|
||||||
|
// because we're still trying to catch up.
|
||||||
|
ledger = adaptor_.acquire(it->first.second);
|
||||||
|
}
|
||||||
|
catch (SHAMapMissingNode const&)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
if (ledger)
|
||||||
{
|
{
|
||||||
for (NodeID const& nodeID : it->second)
|
for (NodeID const& nodeID : it->second)
|
||||||
updateTrie(lock, nodeID, *ledger);
|
updateTrie(lock, nodeID, *ledger);
|
||||||
|
|||||||
Reference in New Issue
Block a user