- added JVM destruction to destructor

inolen · joeferner · commit 2853494bdef8 · 2013-10-24T13:32:54.000-04:00
diff --git a/src/java.cpp b/src/java.cpp
@@ -77,7 +77,7 @@ Java::Java() {
 }
 
 Java::~Java() {
-
+  this->destroyJVM(&this->m_jvm, &this->m_env);
 }
 
 v8::Handle<v8::Value> Java::ensureJvm() {
@@ -159,6 +159,12 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
   return v8::Undefined();
 }
 
+void Java::destroyJVM(JavaVM** jvm, JNIEnv** env) {
+  (*jvm)->DestroyJavaVM();
+  *jvm = NULL;
+  *env = NULL;
+}
+
 /*static*/ v8::Handle<v8::Value> Java::getClassLoader(const v8::Arguments& args) {
   v8::HandleScope scope;
   Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
diff --git a/src/java.h b/src/java.h
@@ -18,6 +18,7 @@ class Java : public node::ObjectWrap {
   Java();
   ~Java();
   v8::Handle<v8::Value> createJVM(JavaVM** jvm, JNIEnv** env);
+  void destroyJVM(JavaVM** jvm, JNIEnv** env);
 
   static v8::Handle<v8::Value> New(const v8::Arguments& args);
   static v8::Handle<v8::Value> getClassLoader(const v8::Arguments& args);

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ Java::Java() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`Java::~Java() {`
`80`		`-`
	`80`	`+ this->destroyJVM(&this->m_jvm, &this->m_env);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`v8::Handle<v8::Value> Java::ensureJvm() {`
`@@ -159,6 +159,12 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM jvm, JNIEnv env) {`
`159`	`159`	`return v8::Undefined();`
`160`	`160`	`}`
`161`	`161`
	`162`	`+void Java::destroyJVM(JavaVM jvm, JNIEnv env) {`
	`163`	`+ (*jvm)->DestroyJavaVM();`
	`164`	`+ *jvm = NULL;`
	`165`	`+ *env = NULL;`
	`166`	`+}`
	`167`	`+`
`162`	`168`	`/static/ v8::Handle<v8::Value> Java::getClassLoader(const v8::Arguments& args) {`
`163`	`169`	`v8::HandleScope scope;`
`164`	`170`	`Java* self = node::ObjectWrap::Unwrap<Java>(args.This());`