Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2025-08-12 18:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Prevent hanging when removing SSC cards from configuration

Browse Source
This commit is contained in:
Brendan Robert
2015-08-08 04:02:40 -05:00
parent 1e99990b34
commit e01a3049c2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/jace/hardware/CardSSC.java
View File

@@ -152,6 +152,7 @@ public class CardSSC extends Card implements Reconfigurable {
hangUp(); hangUp();
socketInput = null; socketInput = null;
} }
Thread.yield();
} catch (SocketTimeoutException ex) { } catch (SocketTimeoutException ex) {
// Do nothing // Do nothing
} catch (IOException ex) { } catch (IOException ex) {
@@ -446,7 +447,8 @@ public class CardSSC extends Card implements Reconfigurable {
hangUp(); hangUp();
if (listenThread != null && listenThread.isAlive()) { if (listenThread != null && listenThread.isAlive()) {
try { try {
listenThread.join(); listenThread.interrupt();
listenThread.join(100);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Logger.getLogger(CardSSC.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(CardSSC.class.getName()).log(Level.SEVERE, null, ex);
} }