Handle RuntimeException in ZigBeePort open method. (#416)

Signed-off-by: YordanDZhelev <[email protected]>
openhab · Apr 9, 2019 · 54bf5bd · 54bf5bd
1 parent 70d1f04
commit 54bf5bd
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/...hab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeSerialPort.java b/...hab.binding.zigbee/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeSerialPort.java
@@ -12,7 +12,9 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Enumeration;
+import java.util.Set;
 import java.util.TooManyListenersException;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,6 +96,8 @@ public class ZigBeeSerialPort implements ZigBeePort, SerialPortEventListener {
      */
     private final Object bufferSynchronisationObject = new Object();
 
+    private Set<String> portOpenRuntimeExcepionMessages = ConcurrentHashMap.newKeySet();
+
     /**
      * Constructor setting port name and baud rate.
      *
@@ -157,6 +161,7 @@ public boolean open(int baudRate, FlowControl flowControl) {
                 serialPort.notifyOnDataAvailable(true);
 
                 logger.debug("Serial port [{}] is initialized.", portName);
+                portOpenRuntimeExcepionMessages.clear();
             } catch (NoSuchPortException e) {
                 logger.error("Serial Error: Port {} does not exist.", portName);
                 return false;
@@ -169,6 +174,12 @@ public boolean open(int baudRate, FlowControl flowControl) {
             } catch (TooManyListenersException e) {
                 logger.error("Serial Error: Too many listeners on Port {}.", portName);
                 return false;
+            } catch (RuntimeException e) {
+                if (!portOpenRuntimeExcepionMessages.contains(e.getMessage())) {
+                    portOpenRuntimeExcepionMessages.add(e.getMessage());
+                    logger.error("Serial Error: Device cannot be opened on Port {}. Caused by {}", portName, e.getMessage());
+                }
+                return false;
             }
 
             try {