Merge pull request #821 from Expensify/master

Update expensify_prod branch
Expensify · Jul 17, 2020 · a021597 · a021597
2 parents f293f40 + 6570215
commit a021597
Show file tree

Hide file tree

Showing 5 changed files with 3,043 additions and 1,876 deletions.
diff --git a/BedrockCore.cpp b/BedrockCore.cpp
@@ -82,7 +82,7 @@ BedrockCore::RESULT BedrockCore::peekCommand(unique_ptr<BedrockCommand>& command
         _db.startTiming(timeout);
 
         try {
-            if (!_db.beginConcurrentTransaction(true, command->request.methodLine)) {
+            if (!_db.beginTransaction(true, command->request.methodLine)) {
                 STHROW("501 Failed to begin concurrent transaction");
             }
 
@@ -187,7 +187,7 @@ BedrockCore::RESULT BedrockCore::processCommand(unique_ptr<BedrockCommand>& comm
         // If a transaction was already begun in `peek`, then this is a no-op. We call it here to support the case where
         // peek created a httpsRequest and closed it's first transaction until the httpsRequest was complete, in which
         // case we need to open a new transaction.
-        if (!_db.insideTransaction() && !_db.beginConcurrentTransaction(true, command->request.methodLine)) {
+        if (!_db.insideTransaction() && !_db.beginTransaction(true, command->request.methodLine)) {
             STHROW("501 Failed to begin concurrent transaction");
         }