Fix resource leak in SysfsUsbSerialScanner (#3513)

Signed-off-by: Jan N. Klug <[email protected]>
openhab · Apr 1, 2023 · 8aa9e11 · 8aa9e11
1 parent 74052e7
commit 8aa9e11
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/...rg/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java b/...rg/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
@@ -154,16 +154,18 @@ private Set<SerialPortInfo> getSerialPortInfos() throws IOException {
         Path devSerialDir = Path.of(DEV_SERIAL_BY_ID_DIRECTORY);
         if (exists(devSerialDir) && isDirectory(devSerialDir) && isReadable(devSerialDir)) {
             // browse serial/by-id directory :
-            for (Path devLinkPath : newDirectoryStream(devSerialDir)) {
-                if (Files.isSymbolicLink(devLinkPath)) {
-                    Path devicePath = getRealDevicePath(devLinkPath);
-                    if (devicePath != null) {
-                        String serialPortName = devicePath.getFileName().toString();
-                        // get the corresponding real sysinfo special dir :
-                        Path sysfsDevicePath = getRealDevicePath(
-                                Paths.get(sysfsTtyDevicesDirectory).resolve(serialPortName));
-                        if (sysfsDevicePath != null && isReadable(devicePath) && isWritable(devicePath)) {
-                            result.add(new SerialPortInfo(devLinkPath, sysfsDevicePath));
+            try (DirectoryStream<Path> directoryStream = newDirectoryStream(devSerialDir)) {
+                for (Path devLinkPath : directoryStream) {
+                    if (Files.isSymbolicLink(devLinkPath)) {
+                        Path devicePath = getRealDevicePath(devLinkPath);
+                        if (devicePath != null) {
+                            String serialPortName = devicePath.getFileName().toString();
+                            // get the corresponding real sysinfo special dir :
+                            Path sysfsDevicePath = getRealDevicePath(
+                                    Paths.get(sysfsTtyDevicesDirectory).resolve(serialPortName));
+                            if (sysfsDevicePath != null && isReadable(devicePath) && isWritable(devicePath)) {
+                                result.add(new SerialPortInfo(devLinkPath, sysfsDevicePath));
+                            }
                         }
                     }
                 }