rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Break out of event listening thread if global app is shutting down

This commit is contained in:
Will Hedgecock 2022-02-16 09:59:26 -06:00
parent 8899eff84f
commit 4184072005
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -2,7 +2,7 @@
* SerialPort.java * SerialPort.java
* *
* Created on: Feb 25, 2012 * Created on: Feb 25, 2012
* Last Updated on: Feb 15, 2022 * Last Updated on: Feb 16, 2022
* Author: Will Hedgecock * Author: Will Hedgecock
* *
* Copyright (C) 2012-2022 Fazecast, Inc. * Copyright (C) 2012-2022 Fazecast, Inc.
@ -54,6 +54,7 @@ public final class SerialPort
static private final String tmpdirAppIdProperty = "fazecast.jSerialComm.appid"; static private final String tmpdirAppIdProperty = "fazecast.jSerialComm.appid";
static private volatile boolean isAndroid = false; static private volatile boolean isAndroid = false;
static private volatile boolean isWindows = false; static private volatile boolean isWindows = false;
static private volatile boolean isShuttingDown = false;
static static
{ {
// Determine the temporary file directory for Java and remove any previous versions of this library // Determine the temporary file directory for Java and remove any previous versions of this library
@ -405,7 +406,14 @@ public final class SerialPort
catch (Exception e) { e.printStackTrace(); } catch (Exception e) { e.printStackTrace(); }
// Add a shutdown hook to ensure all ports get closed // Add a shutdown hook to ensure all ports get closed
Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { uninitializeLibrary(); } }); Runtime.getRuntime().addShutdownHook(new Thread()
{
public void run()
{
isShuttingDown = true;
uninitializeLibrary();
}
});
} }
// Static symbolic link testing function // Static symbolic link testing function
@ -1726,7 +1734,7 @@ public final class SerialPort
@Override @Override
public void run() public void run()
{ {
while (eventListenerRunning) while (eventListenerRunning && !isShuttingDown)
{ {
try { waitForSerialEvent(); } try { waitForSerialEvent(); }
catch (Exception e) catch (Exception e)
@ -1825,7 +1833,7 @@ public final class SerialPort
} }
} }
} }
if (event != LISTENING_EVENT_TIMED_OUT) if (eventListenerRunning && !isShuttingDown && (event != LISTENING_EVENT_TIMED_OUT))
userDataListener.serialEvent(new SerialPortEvent(SerialPort.this, event)); userDataListener.serialEvent(new SerialPortEvent(SerialPort.this, event));
} }
} }