commit 9cbb930b5adb589f7a2ba8140d8d59227c9a570e
author Harshad Deshmukh <hbdeshmukh@apache.org> Wed Sep 27 10:02:10 2017 -0500
committer Harshad Deshmukh <hbdeshmukh@apache.org> Fri Sep 29 10:42:41 2017 -0500
tree b35b7aa35808eae00776f6f4bda6fb4798ef098d
parent bf455e26eb89902731f01928f5eff369a875e5f4

Bug fix in LockManager loop

- Added a false condition for acquire lock
- Added clarifying comment.

transaction/LockManager.cpp

diff --git a/transaction/LockManager.cpp b/transaction/LockManager.cpp
index 2a3760f..c917b4b 100644
--- a/transaction/LockManager.cpp
+++ b/transaction/LockManager.cpp
@@ -80,21 +80,22 @@
         if (request.getRequestType() == RequestType::kReleaseLocks) {
           CHECK(releaseAllLocks(request.getTransactionId()))
               << "Unexpected condition occured.";
-
         } else if (acquireLock(request.getTransactionId(),
                                request.getResourceId(),
                                request.getAccessMode())) {
+          // Lock has been acquired.
+          LOG(INFO) << "Transaction "
+                    << std::to_string(request.getTransactionId())
+                    << " acquired " + request.getResourceId().toString();
+
+          permitted_requests_.push(request);
+        } else {
+          // We are unable to acquire lock at this point.
           LOG(INFO) << "Transaction "
                     << std::to_string(request.getTransactionId())
                     << " is waiting " + request.getResourceId().toString();
 
-            inner_pending_requests_.push(request);
-        } else {
-            LOG(INFO) << "Transaction "
-                      << std::to_string(request.getTransactionId())
-                      << " acquired " + request.getResourceId().toString();
-
-            permitted_requests_.push(request);
+          inner_pending_requests_.push(request);
         }
       }
     }