From c78f6737a5e02afa9feda6fcf2402476cc96d02f Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Mon, 31 May 2010 20:26:29 +0000
Subject: [PATCH] LMS-1503 Temporary fix for failing tests.
SVN: 16230
---
.../java/ch/systemsx/cisd/etlserver/Parameters.java | 12 ++++++++++--
.../dss/generic/server/api/v1/PutDataSetService.java | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
index e48dc6ab7a8..14dbef0b7ff 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
@@ -155,7 +155,7 @@ public class Parameters
public Parameters()
{
- this(new String[0], SystemExit.SYSTEM_EXIT);
+ this(new String[0], SystemExit.SYSTEM_EXIT, false);
}
Parameters(final String[] args)
@@ -164,6 +164,11 @@ public class Parameters
}
Parameters(final String[] args, final IExitHandler systemExitHandler)
+ {
+ this(args, systemExitHandler, true);
+ }
+
+ Parameters(final String[] args, final IExitHandler systemExitHandler, boolean checkParameters)
{
try
{
@@ -176,7 +181,10 @@ public class Parameters
initCommandLineParametersFromProperties();
parser.parseArgument(args);
- ensureParametersCorrect();
+ if (checkParameters)
+ {
+ ensureParametersCorrect();
+ }
} catch (final Exception ex)
{
outputException(ex);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
index 813abd78258..b2ed54f5b80 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/PutDataSetService.java
@@ -105,7 +105,12 @@ class PutDataSetService
*/
class PutDataSetServiceInitializer
{
- private final Parameters params = new Parameters();
+ private final Parameters params;
+
+ PutDataSetServiceInitializer()
+ {
+ params = new Parameters();
+ }
File getIncomingDir()
{
--
GitLab