commit 5adae30ee112f1774479d66fcb6d90589c1e127a
author Matthias Koller <m.koller@peak-solution.de> Fri Nov 08 12:46:17 2019 +0100
committer Matthias Koller <m.koller@peak-solution.de> Fri Nov 08 12:46:17 2019 +0100
tree b252ca46f3bb02a3c8fa4bcf83e80861e6a3de6b
parent 62343e3030cd5fa032a5535e9cf0ed850265e538
parent 4cf4d7f9439c72124be5b99ba85abb113f9ed800

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>

build.gradle

diff --git a/build.gradle b/build.gradle
index e67b14e..9d4e1dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
 
 description = 'MDM API - ODSAdapter'
 group = 'org.eclipse.mdm'
-version = '5.1.0M6-ATFX-SNAPSHOT'
+version = '5.1.0M8-ATFX-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'maven'

src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java

diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java b/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
index 8a1aac1..eebd6aa 100644
--- a/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
+++ b/src/main/java/org/eclipse/mdm/api/odsadapter/ReadRequestHandler.java
@@ -366,6 +366,8 @@
 				column.destroy();
 			} catch (AoException e) {
 				// ignore
+			} catch (Exception e) {
+				// ignore
 			} finally {
 				column._release();
 			}