From 1df316fe2e5a523b29ae1dd565d5450c8e13d49a Mon Sep 17 00:00:00 2001
From: Julien Lopez <julien.lopez@lri.fr>
Date: Wed, 14 Dec 2016 13:43:53 +0100
Subject: [PATCH] [MINOR] Close connection to databases when exiting
---
.../src/com/oracle/truffle/r/engine/TruffleRLanguage.java | 2 ++
.../src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
index a0885395fd..b61eb0c18a 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
@@ -41,6 +41,7 @@ import com.oracle.truffle.r.engine.interop.RForeignAccessFactoryImpl;
import com.oracle.truffle.r.nodes.RASTBuilder;
import com.oracle.truffle.r.nodes.builtin.RBuiltinPackages;
import com.oracle.truffle.r.nodes.instrumentation.RSyntaxTags;
+import com.oracle.truffle.r.nodes.qirinterface.QIRInterface;
import com.oracle.truffle.r.runtime.ExitException;
import com.oracle.truffle.r.runtime.FastROptions;
import com.oracle.truffle.r.runtime.RAccuracyInfo;
@@ -129,6 +130,7 @@ public final class TruffleRLanguage extends TruffleLanguage<RContext> {
@Override
protected void disposeContext(RContext context) {
+ QIRInterface.closeDrivers();
context.destroy();
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
index 2e4ac6ab46..dcdaf1bfe4 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/query/RTableBuiltin.java
@@ -47,7 +47,6 @@ public abstract class RTableBuiltin extends RBuiltinNode {
res.put("configFile", configFile);
res.put("schemaName", schemaName);
} catch (PutException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
return res;
--
GitLab