M pom.xml => pom.xml +2 -1
@@ 5,9 5,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
+ <relativePath>../openhab-addons/bundles</relativePath>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>4.0.1</version>
</parent>
<artifactId>org.openhab.binding.nadreceiver</artifactId>
M src/main/history/dependencies.xml => src/main/history/dependencies.xml +1 -1
@@ 2,7 2,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.nadreceiver">
<feature version="0.0.0">
<feature>wrap</feature>
- <bundle>mvn:commons-net/commons-net/3.7.2</bundle>
+ <bundle>mvn:commons-net/commons-net/3.9.0</bundle>
<bundle>wrap:mvn:org.lastnpe.eea/eea-all/2.2.1</bundle>
</feature>
</features>
M src/main/java/org/openhab/binding/nadreceiver/internal/NadReceiverHandler.java => src/main/java/org/openhab/binding/nadreceiver/internal/NadReceiverHandler.java +4 -0
@@ 387,6 387,10 @@ public class NadReceiverHandler extends BaseThingHandler implements NadReceiverE
sourcesConfiguration = new NadReceiverSourcesConfiguration(maxSources);
try {
+ if (connection != null) {
+ connection.disconnect();
+ connection = null;
+ }
connection = new NadReceiverConnection(hostname, port, heartbeatInterval, reconnectInterval, maxSources,
this, this.scheduler);
M src/main/java/org/openhab/binding/nadreceiver/internal/protocol/NadReceiverConnection.java => src/main/java/org/openhab/binding/nadreceiver/internal/protocol/NadReceiverConnection.java +4 -0
@@ 171,6 171,10 @@ public class NadReceiverConnection {
} catch (IOException e) {
logger.error("Error disconnecting", e);
}
+
+ this.session = null;
+ this.connectRetryJob = null;
+ this.keepAlive = null;
}
private void scheduleConnectRetry(long waitMinutes) {
D src/main/resources/OH-INF/binding/binding.xml => src/main/resources/OH-INF/binding/binding.xml +0 -10
@@ 1,10 0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<binding:binding id="nadreceiver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:binding="https://openhab.org/schemas/binding/v1.0.0"
- xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd">
-
- <name>NAD Receiver Binding</name>
- <description>This is the binding for NAD Receivers (e.g. T758v3)</description>
- <author>Marc Chételat</author>
-
-</binding:binding>