From 140f00a2efbecabf0660f39757511a05da378b94 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 17 May 2009 19:58:51 +0000
Subject: fix bug 346721

(bzr r7897)
---
 src/bind/javabind.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/bind/javabind.cpp')

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;
 }
-- 
cgit v1.2.3