fix ttl not work due to job not close tx

Change-Id: Ic4a3bc11e67f92c88772149d5c304a2c1da0ec64
apache · Jan 12, 2021 · 921efba · 921efba
1 parent 26ac664
commit 921efba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/SysJob.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/job/SysJob.java
@@ -31,7 +31,11 @@ public V call() throws Exception {
 
     @Override
     protected void done() {
-        this.save();
+        try {
+            this.save();
+        } finally {
+            super.done();
+        }
     }
 
     @Override

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/job/UserJob.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/job/UserJob.java
@@ -31,7 +31,11 @@ public V call() throws Exception {
 
     @Override
     protected void done() {
-        this.save();
+        try {
+            this.save();
+        } finally {
+            super.done();
+        }
     }
 
     @Override

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskCallable.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/task/TaskCallable.java
@@ -48,13 +48,19 @@ public TaskCallable() {
     }
 
     protected void done() {
-        // Do nothing, subclasses may override this method
+        this.closeTx();
     }
 
     protected void cancelled() {
         // Do nothing, subclasses may override this method
     }
 
+    protected void closeTx() {
+        if (this.graph().tx().isOpen()) {
+            this.graph().tx().close();
+        }
+    }
+
     public void setMinSaveInterval(long seconds) {
         E.checkArgument(seconds > 0,
                         "Must set interval > 0, bug got '%s'", seconds);