public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[avmfritz] Properly interrupt monitor thread upon dispose (#9201) 

* Properly interrupt monitor thread upon dispose

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2020-12-03 17:19:10 +01:00 committed by GitHub
parent 72b0c1473c
commit a736e64402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/callmonitor/CallMonitor.java
View File

@ -75,6 +75,10 @@ public class CallMonitor {
*/ */
public void dispose() { public void dispose() {
reconnectJob.cancel(true); reconnectJob.cancel(true);
CallMonitorThread monitorThread = this.monitorThread;
if (monitorThread != null) {
monitorThread.interrupt();
}
} }
public class CallMonitorThread extends Thread { public class CallMonitorThread extends Thread {
@ -120,11 +124,13 @@ public class CallMonitor {
handler.setStatusInfo(ThingStatus.ONLINE, ThingStatusDetail.NONE, null); handler.setStatusInfo(ThingStatus.ONLINE, ThingStatusDetail.NONE, null);
while (!interrupted) { while (!interrupted) {
try { try {
String line = reader.readLine(); if (reader.ready()) {
if (line != null) { String line = reader.readLine();
logger.debug("Received raw call string from fbox: {}", line); if (line != null) {
CallEvent ce = new CallEvent(line); logger.debug("Received raw call string from fbox: {}", line);
handleCallEvent(ce); CallEvent ce = new CallEvent(line);
handleCallEvent(ce);
}
} }
} catch (IOException e) { } catch (IOException e) {
if (interrupted) { if (interrupted) {
@ -136,8 +142,9 @@ public class CallMonitor {
break; break;
} finally { } finally {
try { try {
sleep(1000L); sleep(500L);
} catch (InterruptedException e) { } catch (InterruptedException e) {
interrupted = true;
} }
} }
} }