commit cce554ec472d9a583845d8b7c77e12c853bfa880
author Arthur Ishiguro <arthuri@google.com> Fri Dec 08 09:26:17 2017 -0800
committer Arthur Ishiguro <arthuri@google.com> Mon Dec 11 18:05:02 2017 +0000
tree b1e493721b2f5bec1b0245bf154f417dfab0d70d
parent 4dc7e049f0123065906b2126941a144d0c7a5821

Handles transactions started immediately after completion

Unset mIsTransactionPending before invoking handleTxnResult
to allow service to start a new transaction.

Bug: 70387233
Test: Run a sample application that concurrently loads and unloads 2
nanoapps, verify both transactions succeed.

Change-Id: I465882dd8fd8fdd89b959642f6fdc2e452ce61a6

contexthub/1.0/default/Contexthub.cpp

diff --git a/contexthub/1.0/default/Contexthub.cpp b/contexthub/1.0/default/Contexthub.cpp
index 5d6a0d6..5f83a22 100644
--- a/contexthub/1.0/default/Contexthub.cpp
+++ b/contexthub/1.0/default/Contexthub.cpp
@@ -281,11 +281,11 @@
                 result = TransactionResult::FAILURE;
             }
 
+            mIsTransactionPending = false;
             if (cb != nullptr) {
                 cb->handleTxnResult(mTransactionId, result);
             }
             retVal = 0;
-            mIsTransactionPending = false;
             break;
         }