Merge pull request #2824 from nicolatimeus/fix_backport-comm-connecti…

…on-close-port Backport of #2822 to release-4.1.0
eclipse-kura · Apr 30, 2020 · eeb3bf7 · eeb3bf7
2 parents 62fdb64 + 6cb5b20
commit eeb3bf7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
@@ -9,7 +9,7 @@ org.eclipse.kura.broker.artemis.xml.version=1.0.300
 org.eclipse.kura.core.version=1.0.501
 org.eclipse.kura.core.certificates.version=1.0.500
 org.eclipse.kura.core.cloud.version=1.1.400
-org.eclipse.kura.core.comm.version=1.0.500
+org.eclipse.kura.core.comm.version=1.0.501
 org.eclipse.kura.core.configuration.version=2.0.200
 org.eclipse.kura.core.crypto.version=1.0.500
 org.eclipse.kura.deployment.agent.version=1.0.500

diff --git a/kura/org.eclipse.kura.core.comm/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.core.comm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.kura.core.comm
 Bundle-SymbolicName: org.eclipse.kura.core.comm;singleton:=true
-Bundle-Version: 1.0.501.qualifier
+Bundle-Version: 1.0.501
 Bundle-Vendor: Eclipse Kura
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/*.xml

diff --git a/kura/org.eclipse.kura.core.comm/pom.xml b/kura/org.eclipse.kura.core.comm/pom.xml
@@ -24,7 +24,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.kura.core.comm</artifactId>
-	<version>1.0.501-SNAPSHOT</version>
+	<version>1.0.501</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>

diff --git a/...g.eclipse.kura.core.comm/src/main/java/org/eclipse/kura/core/comm/CommConnectionImpl.java b/...g.eclipse.kura.core.comm/src/main/java/org/eclipse/kura/core/comm/CommConnectionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2016 Eurotech and/or its affiliates and others
+ * Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -29,7 +29,6 @@
 import javax.comm.NoSuchPortException;
 import javax.comm.PortInUseException;
 import javax.comm.SerialPort;
-import javax.comm.UnsupportedCommOperationException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -88,9 +87,14 @@ public CommConnectionImpl(CommURI commUri, int mode, boolean timeouts)
 
         final CommPort commPort = commPortIdentifier.open(this.getClass().getName(), openTimeout);
 
-        if (commPort instanceof SerialPort) {
-            this.serialPort = (SerialPort) commPort;
-            try {
+        if (commPort == null) {
+            throw new NoSuchPortException("CommPortIdentifier.open() returned a null port");
+        }
+
+        try {
+            if (commPort instanceof SerialPort) {
+                this.serialPort = (SerialPort) commPort;
+
                 this.serialPort.setSerialPortParams(baudRate, dataBits, stopBits, parity);
                 this.serialPort.setFlowControlMode(flowControl);
                 if (receiveTimeout > 0) {
@@ -99,12 +103,13 @@ public CommConnectionImpl(CommURI commUri, int mode, boolean timeouts)
                         throw new IOException("Serial receive timeout not supported by driver");
                     }
                 }
-            } catch (UnsupportedCommOperationException e) {
-                logger.error("Failed to configure COM port", e);
-                throw new IOException(e);
+            } else {
+                throw new IOException("Unsupported Port Type");
             }
-        } else {
-            throw new IOException("Unsupported Port Type");
+        } catch (final Exception e) {
+            logger.error("Failed to configure COM port", e);
+            commPort.close();
+            throw new IOException(e);
         }
     }