[incubator-iotdb] branch master updated: fix an unproperly initialized var (#148)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 0fa0749  fix an unproperly initialized var (#148)
0fa0749 is described below

commit 0fa074998854b4f3ccd20d444da6dad67b47f66c
Author: Jiang Tian <jt...@163.com>
AuthorDate: Fri Apr 12 23:42:57 2019 +0800

    fix an unproperly initialized var (#148)
    
    * add java doc
    enhance concurrency
    refine some naming
    add more specific logs
    
    * fix invalid write when memory usage level is dangerous in BufferWriteProcessor
    add shutdown hook to report memory usage
    
    * undo time update when insertion failed
    
    * complete undo logic
    
    * remove undo in exception
    
    * fix an unproperly initialized var
---
 .../org/apache/iotdb/db/engine/memcontrol/RecordMemController.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java
index e96e280..80a8014 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/memcontrol/RecordMemController.java
@@ -144,11 +144,12 @@ public class RecordMemController extends BasicMemController {
   @Override
   public void releaseUsage(Object user, long freeSize) {
     AtomicLong usage = memMap.get(user);
-    long usageLong = 0;
     if (usage == null) {
       LOGGER.error("Unregistered memory usage from {}", user);
-    } else if (freeSize > usageLong) {
-      usageLong = usage.get();
+      return;
+    }
+    long usageLong = usage.get();
+    if (freeSize > usageLong) {
       LOGGER
           .error("{} requests to free {} bytes while it only registered {} bytes", user,
               freeSize, usage);