Skip to content

Commit bfe85ce

Browse files
authored
Prevent duplicate event listeners (#20554)
Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
1 parent b4686a2 commit bfe85ce

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

  • bundles
    • org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler
    • org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler
    • org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler

bundles/org.openhab.binding.monopriceaudio/src/main/java/org/openhab/binding/monopriceaudio/internal/handler/MonopriceAudioHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ private synchronized boolean openConnection() {
462462
private synchronized void closeConnection() {
463463
if (connector.isConnected()) {
464464
connector.close();
465-
connector.removeEventListener(this);
466465
logger.debug("closeConnection(): disconnected");
467466
}
467+
connector.removeEventListener(this);
468468
}
469469

470470
@Override
@@ -698,10 +698,10 @@ private void processMonoprice70Update(MonopriceAudioZoneDTO zoneData, MonopriceA
698698
* @param channelType the channel type to be updated
699699
*/
700700
private void updateChannelState(String zoneId, String channelType) {
701-
MonopriceAudioZoneDTO zoneData = zoneDataMap.get(zoneId);
701+
final MonopriceAudioZoneDTO zoneData = zoneDataMap.get(zoneId);
702702

703703
if (zoneData != null) {
704-
String channel = amp.getZoneName(zoneId) + CHANNEL_DELIMIT + channelType;
704+
final String channel = amp.getZoneName(zoneId) + CHANNEL_DELIMIT + channelType;
705705

706706
if (!isLinked(channel)) {
707707
return;

bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,10 @@ private synchronized boolean openConnection() {
680680
private synchronized void closeConnection() {
681681
if (connector.isConnected()) {
682682
connector.close();
683-
connector.removeEventListener(this);
684683
pollStatusNeeded = true;
685684
logger.debug("closeConnection(): disconnected");
686685
}
686+
connector.removeEventListener(this);
687687
}
688688

689689
/**

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,9 @@ private synchronized void closeConnection() {
379379

380380
if (connector.isConnected()) {
381381
connector.close();
382-
connector.removeEventListener(this);
383382
logger.debug("closeConnection(): disconnected");
384383
}
384+
connector.removeEventListener(this);
385385
}
386386

387387
/**

0 commit comments

Comments
 (0)