Skip to content

Commit 22d907f

Browse files
authored
Refactor usages of deprecated methods (openhab#18092)
Signed-off-by: Michael Lobstein <[email protected]>
1 parent fad9107 commit 22d907f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/discovery/OppoDiscoveryService.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.io.IOException;
1818
import java.net.DatagramPacket;
1919
import java.net.InetAddress;
20+
import java.net.InetSocketAddress;
2021
import java.net.MulticastSocket;
2122
import java.net.NetworkInterface;
2223
import java.net.SocketTimeoutException;
@@ -138,9 +139,10 @@ protected void startScan() {
138139
service.execute(() -> {
139140
try {
140141
MulticastSocket multiSocket = new MulticastSocket(SDDP_PORT);
142+
InetSocketAddress inetSocketAddress = new InetSocketAddress(addr, SDDP_PORT);
141143
multiSocket.setSoTimeout(TIMEOUT_MS);
142144
multiSocket.setNetworkInterface(netint);
143-
multiSocket.joinGroup(addr);
145+
multiSocket.joinGroup(inetSocketAddress, null);
144146

145147
while (scanning) {
146148
DatagramPacket receivePacket = new DatagramPacket(new byte[BUFFER_SIZE], BUFFER_SIZE);
@@ -156,10 +158,13 @@ protected void startScan() {
156158
}
157159
}
158160

161+
multiSocket.leaveGroup(inetSocketAddress, null);
159162
multiSocket.close();
160163
} catch (IOException e) {
161-
if (e.getMessage() != null && !e.getMessage().contains("No IP addresses bound to interface")) {
162-
logger.debug("OppoDiscoveryService IOException: {}", e.getMessage(), e);
164+
final String message = e.getMessage();
165+
if (message != null && !message.contains("No IP addresses bound to interface")
166+
&& !message.contains("Network interface not configured for IPv4")) {
167+
logger.debug("OppoDiscoveryService IOException: {}", message, e);
163168
}
164169
}
165170
});

0 commit comments

Comments
 (0)