From aea0fc61e7e17a3627c29c31b9139c2f6155de7d Mon Sep 17 00:00:00 2001
From: schlaepfer <schlaepfer@94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c>
Date: Tue, 28 Mar 2006 05:42:56 +0000
Subject: [PATCH] - HALT inserted if JVM could not be created - ConnecteDevice
 in ReopenDevice

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@120 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
---
 blackbox/Usb/Mod/BDI.otd | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/blackbox/Usb/Mod/BDI.otd b/blackbox/Usb/Mod/BDI.otd
index 6307506..34c136e 100644
--- a/blackbox/Usb/Mod/BDI.otd
+++ b/blackbox/Usb/Mod/BDI.otd
@@ -267,6 +267,7 @@ MODULE UsbBDI;
 		IF bool = FALSE_ THEN
 			Done := FALSE;
 			Log.String("creating JVM failed"); Log.Ln;
+			HALT(77);
 		ELSE
 			Done := TRUE;
 			Log.String("JVM successfully created"); Log.Ln;
@@ -387,8 +388,8 @@ MODULE UsbBDI;
 
 	PROCEDURE CheckIfFileExists (filePath: ARRAY OF CHAR; fileName: ARRAY OF CHAR): BOOLEAN;
 		VAR
-			i: INTEGER;	done: BOOLEAN;
-			loc: Files.Locator;	file: Files.File;	name: Files.Name;
+			i: INTEGER; 	done: BOOLEAN;
+			loc: Files.Locator; 	file: Files.File; 	name: Files.Name;
 	BEGIN
 		loc := Files.dir.This(filePath);
 		IF loc.res # 0 THEN (*RETURN FALSE*) END;
@@ -418,11 +419,11 @@ MODULE UsbBDI;
 				(*
 				CreateJVM("D:\work\USB\eclipse\mcdp\bin\");
 				*)
-				IF ~Done THEN HALT(77) END;
+				IF ~Done THEN HALT(78) END;
 				jvmCreated := TRUE;
 			END;
 			BDI.USB_Device_open;
-			IF ~Done THEN HALT(78) END;
+			IF ~Done THEN HALT(79) END;
 			deviceOpen := TRUE;
 		END
 	END ConnectDevice;
@@ -435,6 +436,7 @@ MODULE UsbBDI;
 	(* Close and reopen the device *)
 	PROCEDURE ReopenDevice * ;
 	BEGIN
+		ConnectDevice;
 		USB_Device_close;
 		USB_Device_open;
 		IF Done THEN