jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add DetachCurrentThread back in for directors. The problems occuring on Solaris look like they were jdk bugs (1.4.2 and older)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9983 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-10-12 21:40:01 +00:00
commit fd851b9380
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/test-suite/java/director_thread_runme.java
View file

@ -14,16 +14,13 @@ public class director_thread_runme {
} }
public static void main(String argv[]) { public static void main(String argv[]) {
/* // This test used to hang the process. The solution is to call DetachCurrentThread in ~JNIEnvWrapper, however it causes seg faults in other JNI calls on older JDKs on Solaris. See SWIG_JAVA_NO_DETACH_CURRENT_THREAD in director.swg.
director_thread_Derived d = new director_thread_Derived(); director_thread_Derived d = new director_thread_Derived();
d.run(); d.run();
if (d.getVal() >= 0) { if (d.getVal() >= 0) {
throw new RuntimeException("Failed. Val: " + d.getVal()); throw new RuntimeException("Failed. Val: " + d.getVal());
} }
*/
// Disabled as it hangs the process. The solution of calling DetachCurrentThread in ~JNIEnvWrapper causes seg faults in other JNI calls on some machines
System.err.println("Disabled runtest - it fails");
} }
} }

6
Lib/java/director.swg
View file

@ -116,7 +116,11 @@ namespace Swig {
director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL); director_->swig_jvm_->AttachCurrentThread((void **) &jenv_, NULL);
} }
~JNIEnvWrapper() { ~JNIEnvWrapper() {
//director_->swig_jvm_->DetachCurrentThread(); // Some JVMs, eg JDK 1.4.2 and lower on Solaris have a bug and crash with the DetachCurrentThread call.
// However, without this call, the JVM hangs on exit when the thread was not created by the JVM and creates a memory leak.
#if !defined(SWIG_JAVA_NO_DETACH_CURRENT_THREAD)
director_->swig_jvm_->DetachCurrentThread();
#endif
} }
JNIEnv *getJNIEnv() const { JNIEnv *getJNIEnv() const {
return jenv_; return jenv_;