|
 |
25a9051 |
--- mp-7fd4828c934fccf7367499c9e01cc9a1e90a2093/solvers/jacop/java.cc.orig 2020-03-03 23:39:58.000000000 -0700
|
|
|
25a9051 |
+++ mp-7fd4828c934fccf7367499c9e01cc9a1e90a2093/solvers/jacop/java.cc 2021-01-15 14:48:04.231938853 -0700
|
|
|
25a9051 |
@@ -119,7 +119,7 @@ std::string RegKey::GetStrValue(fmt::CSt
|
|
|
25a9051 |
|
|
|
25a9051 |
namespace mp {
|
|
|
25a9051 |
|
|
|
25a9051 |
-JVM JVM::instance_;
|
|
|
25a9051 |
+JVM *JVM::instance_;
|
|
|
25a9051 |
|
|
|
25a9051 |
void Env::Throw(jthrowable exception, const char *method_name) {
|
|
|
25a9051 |
env_->ExceptionClear();
|
|
|
25a9051 |
@@ -190,8 +190,16 @@ JVM::~JVM() {
|
|
|
25a9051 |
jvm_->DestroyJavaVM();
|
|
|
25a9051 |
}
|
|
|
25a9051 |
|
|
|
25a9051 |
+void JVM::cleanup_jvm()
|
|
|
25a9051 |
+{
|
|
|
25a9051 |
+ if (instance_) {
|
|
|
25a9051 |
+ delete instance_;
|
|
|
25a9051 |
+ instance_ = nullptr;
|
|
|
25a9051 |
+ }
|
|
|
25a9051 |
+}
|
|
|
25a9051 |
+
|
|
|
25a9051 |
Env JVM::env(const char *const *options) {
|
|
|
25a9051 |
- if (!instance_.jvm_) {
|
|
|
25a9051 |
+ if (!instance_) {
|
|
|
25a9051 |
#ifdef _WIN32
|
|
|
25a9051 |
std::string runtime_lib_path;
|
|
|
25a9051 |
bool exists = false;
|
|
|
25a9051 |
@@ -251,15 +259,19 @@ Env JVM::env(const char *const *options)
|
|
|
25a9051 |
}
|
|
|
25a9051 |
vm_args.nOptions = static_cast<jint>(jvm_options.size());
|
|
|
25a9051 |
vm_args.options = &jvm_options[0];
|
|
|
25a9051 |
+ instance_ = new JVM();
|
|
|
25a9051 |
void *envp = 0;
|
|
|
25a9051 |
- jint result = JNI_CreateJavaVM(&instance_.jvm_, &envp, &vm_args);
|
|
|
25a9051 |
+ jint result = JNI_CreateJavaVM(&instance_->jvm_, &envp, &vm_args);
|
|
|
25a9051 |
if (result != JNI_OK) {
|
|
|
25a9051 |
+ delete instance_;
|
|
|
25a9051 |
+ instance_ = nullptr;
|
|
|
25a9051 |
throw JavaError(fmt::format(
|
|
|
25a9051 |
"Java VM initialization failed, error code = {}", result));
|
|
|
25a9051 |
}
|
|
|
25a9051 |
- instance_.env_ = Env(static_cast<JNIEnv*>(envp));
|
|
|
25a9051 |
+ instance_->env_ = Env(static_cast<JNIEnv*>(envp));
|
|
|
25a9051 |
+ std::atexit(cleanup_jvm);
|
|
|
25a9051 |
}
|
|
|
25a9051 |
- return instance_.env_;
|
|
|
25a9051 |
+ return instance_->env_;
|
|
|
25a9051 |
}
|
|
|
25a9051 |
|
|
|
25a9051 |
ClassBase::~ClassBase() {}
|
|
|
25a9051 |
--- mp-7fd4828c934fccf7367499c9e01cc9a1e90a2093/solvers/jacop/java.h.orig 2020-03-03 23:39:58.000000000 -0700
|
|
|
25a9051 |
+++ mp-7fd4828c934fccf7367499c9e01cc9a1e90a2093/solvers/jacop/java.h 2021-01-15 14:33:39.263164981 -0700
|
|
|
25a9051 |
@@ -215,7 +215,8 @@ class JVM {
|
|
|
25a9051 |
private:
|
|
|
25a9051 |
JavaVM *jvm_;
|
|
|
25a9051 |
Env env_;
|
|
|
25a9051 |
- static JVM instance_;
|
|
|
25a9051 |
+ static JVM *instance_;
|
|
|
25a9051 |
+ static void cleanup_jvm();
|
|
|
25a9051 |
|
|
|
25a9051 |
JVM() : jvm_() {}
|
|
|
25a9051 |
~JVM();
|