SE-271 fix race condition: do not reuse the query in all servlet instances....

SE-271 fix race condition: do not reuse the query in all servlet instances. One servlet can close the query which is just beng used by another one.

SVN: 17012

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/HCSImageDatasetLoaderFactory.java

@@ -20,11 +20,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-
-
 import ch.systemsx.cisd.openbis.dss.etl.dataaccess.HCSImageDatasetLoader;
 import ch.systemsx.cisd.openbis.dss.shared.DssScreeningUtils;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
 
 /**
  * @author Tomasz Pylak
@@ -34,8 +31,6 @@ public class HCSImageDatasetLoaderFactory
     private static final Map<String, IContentRepositoryFactory> repositoryFactories =
             createFactories();
 
-    private static final IImagingQueryDAO query = DssScreeningUtils.createQuery();
-
     private static Map<String, IContentRepositoryFactory> createFactories()
     {
         Map<String, IContentRepositoryFactory> factories =
@@ -52,7 +47,7 @@ public class HCSImageDatasetLoaderFactory
     private static HCSImageDatasetLoader createImageDBLoader(File datasetRootDir, String datasetCode)
     {
         IContentRepository repository = new ContentRepository(datasetRootDir, repositoryFactories);
-        return new HCSImageDatasetLoader(query, datasetCode, repository);
+        return new HCSImageDatasetLoader(DssScreeningUtils.createQuery(), datasetCode, repository);
     }
 
 }