From 7fbc44a866f4b90432e19161ec3628851b37ccef Mon Sep 17 00:00:00 2001 From: David Schwartz Date: Thu, 25 Jul 2013 10:44:11 -0700 Subject: [PATCH] Compute the load for admins correctly. --- modules/ripple_core/functional/ripple_LoadFeeTrack.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ripple_core/functional/ripple_LoadFeeTrack.h b/modules/ripple_core/functional/ripple_LoadFeeTrack.h index 6c3398cab..d65d296cd 100644 --- a/modules/ripple_core/functional/ripple_LoadFeeTrack.h +++ b/modules/ripple_core/functional/ripple_LoadFeeTrack.h @@ -36,8 +36,9 @@ public: uint32 feeFactor = std::max (mLocalTxnLoadFee, mRemoteTxnLoadFee); // Let admins pay the normal fee until the local load exceeds four times the remote - if (bAdmin && (feeFactor > mRemoteTxnLoadFee) && (feeFactor < (4 * mRemoteTxnLoadFee))) - feeFactor = mRemoteTxnLoadFee; + uint32 uRemFee = std::max(mRemoteTxnLoadFee, mClusterTxnLoadFee); + if (bAdmin && (feeFactor > uRemFee) && (feeFactor < (4 * uRemFee))) + feeFactor = uRemFee; { boost::mutex::scoped_lock sl (mLock);