From d5244c83383e7805ac1a0f41f5cb787cc420304c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 14 Sep 2015 11:45:31 +0000
Subject: [PATCH] SSDM-2421: Declaring inner class
ImageUtil.ReaderAndFileHandler as private. Fixing bug in
ImagingDataSetRegistrationTransaction.close().
SVN: 34640
---
.../cisd/openbis/dss/generic/shared/utils/ImageUtil.java | 7 +------
.../jython/v2/ImagingDataSetRegistrationTransaction.java | 1 +
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
index 3814dde5de7..4190e0c2cc8 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
@@ -475,7 +475,7 @@ public class ImageUtil
}
- static class ReaderAndFileHandler
+ private static class ReaderAndFileHandler
{
private IImageReader imageReader;
@@ -514,11 +514,6 @@ public class ImageUtil
imageReader.close();
}
- @Override
- protected void finalize() throws Throwable
- {
- }
-
void setImageReader(IImageReader imageReader)
{
this.imageReader = imageReader;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
index a54595b0cf3..745e96e1ea7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
@@ -127,6 +127,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
{
ImageUtil.closeSession(Thread.currentThread().getName());
ImageUtil.setThreadLocalSessionId(null);
+ super.close();
}
public JythonPlateDatasetFactory getFactory()
--
GitLab