From d5f92b3a7fd566fd491f9b0f94ab1194fefeeddc Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 27 Mar 2015 09:04:32 +0000
Subject: [PATCH] SSDM-1663 : Ingestion service - moving log files fails
SVN: 33751
---
.../dss/generic/server/plugins/standard/IngestionService.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
index 42e75508119..32346a57153 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
@@ -91,8 +91,6 @@ public abstract class IngestionService<T extends DataSetInformation> extends Agg
private final IMailClient mailClient;
- private final DssUniqueFilenameGenerator filenameGenerator;
-
/**
* Constructor for the AbstractDbModifyingAggegation service. This constructor is used by the ReportingPluginTaskFactory.
*
@@ -133,7 +131,6 @@ public abstract class IngestionService<T extends DataSetInformation> extends Agg
this.dssProperties = dssProperties;
this.openBisService = openBisService;
this.mailClient = mailClient;
- filenameGenerator = new DssUniqueFilenameGenerator("mock", "file", "serialized");
}
@Override
@@ -275,6 +272,7 @@ public abstract class IngestionService<T extends DataSetInformation> extends Agg
protected File createMockIncomingFile(Map<String, Object> parameters) throws IOException
{
HashMap<String, Object> parameterHashMap = new HashMap<String, Object>(parameters);
+ DssUniqueFilenameGenerator filenameGenerator = new DssUniqueFilenameGenerator(Thread.currentThread().getName(), "file", "serialized");
File mockIncomingDataSetFile =
new File(getMockIncomingDir(), filenameGenerator.generateFilename());
mockIncomingDataSetFile.createNewFile();
--
GitLab