From 6bd4425fbb5f7bb1dd3355bd31f08a50c93797f0 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Tue, 27 Nov 2018 14:38:48 +0100
Subject: [PATCH] SSDM-6958: Making EodSqlUtils more robust against test with
mocked transactions
---
.../cisd/openbis/generic/shared/util/EodSqlUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java
index da6eb956df8..663471efac1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java
@@ -44,10 +44,11 @@ public class EodSqlUtils
Class<? extends TransactionDriver> transactionDriverClass = transactionDriver.getClass();
Field jdbcResourceTransactionField = transactionDriverClass.getDeclaredField("jdbcResourceTransaction");
jdbcResourceTransactionField.setAccessible(true);
- LogicalConnectionImplementor logicalConnectionImplementor = (LogicalConnectionImplementor) jdbcResourceTransactionField.get(transactionDriver);
+ LogicalConnectionImplementor logicalConnectionImplementor =
+ (LogicalConnectionImplementor) jdbcResourceTransactionField.get(transactionDriver);
Connection connection = logicalConnectionImplementor.getPhysicalConnection();
QueryTool.setManagedDatabaseConnection(connection);
- } catch (NoSuchFieldException e)
+ } catch (NoSuchFieldException | ClassCastException e)
{
// We are looking at some other kind of transaction -- log the error, but do not do anything
Logger log = LogFactory.getLogger(LogCategory.TRACKING, EodSqlUtils.class);
--
GitLab