commit 8d933f47c0744dd39353e001bbe5a178bb18a5d7
author salsubaiee <salsubaiee@gmail.com> Sat Aug 03 13:19:07 2013 -0700
committer salsubaiee <salsubaiee@gmail.com> Wed Aug 14 22:19:00 2013 -0700
tree 48477d0b4f0599948c7d35e1f243ace4be600b09
parent 7b7c0c9fb48f1f800b0a2eb5668716cbb428dfd0

fix for issue 594.

asterix-common/src/main/java/edu/uci/ics/asterix/common/context/PrimaryIndexOperationTracker.java

diff --git a/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/PrimaryIndexOperationTracker.java b/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/PrimaryIndexOperationTracker.java
index ad363f3..3347fcc 100644
--- a/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/PrimaryIndexOperationTracker.java
+++ b/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/PrimaryIndexOperationTracker.java
@@ -48,7 +48,9 @@
     public synchronized void beforeOperation(ILSMIndex index, LSMOperationType opType,
             ISearchOperationCallback searchCallback, IModificationOperationCallback modificationCallback)
             throws HyracksDataException {
-        numActiveOperations++;
+        if (opType == LSMOperationType.MODIFICATION || opType == LSMOperationType.FORCE_MODIFICATION) {
+            numActiveOperations++;
+        }
     }
 
     @Override
@@ -66,7 +68,10 @@
             IModificationOperationCallback modificationCallback) throws HyracksDataException {
         int nActiveOps;
         synchronized (this) {
-            nActiveOps = numActiveOperations--;
+            if (opType == LSMOperationType.MODIFICATION || opType == LSMOperationType.FORCE_MODIFICATION) {
+                numActiveOperations--;
+            }
+            nActiveOps = numActiveOperations;
         }
         if (opType != LSMOperationType.FLUSH) {
             flushIfFull(nActiveOps);