summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2009-05-17 19:58:51 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2009-05-17 19:58:51 +0000
commit140f00a2efbecabf0660f39757511a05da378b94 (patch)
tree267a665a47581fc983c4708a389f13f05aba34f0
parentadd support for different encodings (diff)
downloadinkscape-140f00a2efbecabf0660f39757511a05da378b94.tar.gz
inkscape-140f00a2efbecabf0660f39757511a05da378b94.zip
fix bug 346721
(bzr r7897)
-rw-r--r--src/bind/javabind.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index cb8c778b1..f7022584f 100644
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -927,8 +927,14 @@ bool JavaBinderyImpl::loadJVM()
int versionMinor = (vers ) & 0xffff;
msg("Loaded JVM version %d.%d", versionMajor, versionMinor);
- if (!setupGateway())
+ if (!setupGateway()) {
+ // set jvm = NULL, otherwise, this method will return true when called for the second time while the gateway might not have been created!
+ jvm->DestroyJavaVM();
+ jvm = NULL;
+ env = NULL;
+ err("Java bindings: setupGateway() failed");
return false;
+ }
return true;
}