Review fixes (2) ximinez.

Author: Mark Travis

Builds/CMake/RippledCore.cmake

@@ -163,6 +163,7 @@ install (
     src/ripple/basics/Slice.h
     src/ripple/basics/spinlock.h
     src/ripple/basics/StringUtilities.h
+    src/ripple/basics/SubmitSync.h
     src/ripple/basics/ThreadSafetyAnalysis.h
     src/ripple/basics/ToString.h
     src/ripple/basics/UnorderedContainers.h

src/ripple/app/ledger/impl/LedgerMaster.cpp

@@ -550,22 +550,24 @@ LedgerMaster::applyHeldTransactions()
 {
     std::lock_guard sl(m_mutex);
     // It can be expensive to modify the open ledger even with no transactions
-    // to process.
-    if (!mHeldTransactions.size())
-        return;
-
-    app_.openLedger().modify([&](OpenView& view, beast::Journal j) {
-        bool any = false;
-        for (auto const& it : mHeldTransactions)
+    // to process. Regardless, make sure to reset held transactions with
+    // the parent.
+    if (mHeldTransactions.size())
+    {
+        app_.openLedger().modify([&](OpenView &view, beast::Journal j)
         {
-            ApplyFlags flags = tapNONE;
-            auto const result =
-                app_.getTxQ().apply(app_, view, it.second, flags, j);
-            if (result.second)
-                any = true;
-        }
-        return any;
-    });
+            bool any = false;
+            for (auto const &it: mHeldTransactions)
+            {
+                ApplyFlags flags = tapNONE;
+                auto const result =
+                    app_.getTxQ().apply(app_, view, it.second, flags, j);
+                if (result.second)
+                    any = true;
+            }
+            return any;
+        });
+    }
 
     // VFALCO TODO recreate the CanonicalTxSet object instead of resetting
     // it.

src/test/jtx/Env_test.cpp

@@ -965,7 +965,6 @@ class Env_test : public beast::unit_test::suite
         payment = noop("alice");
         payment[sfSequence.fieldName] = env.seq("alice");
         payment[sfSetFlag.fieldName] = 0;
-        auto req = payment;
         jr = applyJsonTxn(RPC::SubmitSync::sync, secret, payment);
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "tesSUCCESS");