From b01eb0d25f6dd7b64765f930982c728bb64e96c0 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 23 May 2008 07:54:54 +0000
Subject: [PATCH] fix: - Bugs found by FindBugs.
SVN: 6261
---
bds/source/java/ch/systemsx/cisd/bds/Constants.java | 4 +++-
bds/source/java/ch/systemsx/cisd/bds/DataSet.java | 3 +--
.../ch/systemsx/cisd/bds/ExperimentRegistrationTimestamp.java | 4 ++--
bds/source/java/ch/systemsx/cisd/bds/Utilities.java | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/Constants.java b/bds/source/java/ch/systemsx/cisd/bds/Constants.java
index c633937130f..ff63810174f 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/Constants.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/Constants.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.bds;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.concurrent.atomic.AtomicReference;
/**
* Some constants used inside the <i>BDS</i> library
@@ -34,7 +35,8 @@ public final class Constants
public final static char PATH_SEPARATOR = '/';
/** The uniformly date format used. */
- public static final DateFormat DATE_FORMAT = new SimpleDateFormat(DATE_FORMAT_PATTERN);
+ public static final AtomicReference<DateFormat> DATE_FORMAT =
+ new AtomicReference<DateFormat>(new SimpleDateFormat(DATE_FORMAT_PATTERN));
private Constants()
{
diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataSet.java b/bds/source/java/ch/systemsx/cisd/bds/DataSet.java
index 3f1a09ec070..7513902f7cf 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataSet.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataSet.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
-
import ch.systemsx.cisd.bds.exception.DataStructureException;
import ch.systemsx.cisd.bds.storage.IDirectory;
import ch.systemsx.cisd.common.collections.CollectionIO;
@@ -203,7 +202,7 @@ public final class DataSet implements IStorable
folder.addKeyValuePair(CODE, code);
folder.addKeyValuePair(PRODUCTION_TIMESTAMP,
productionTimestamp == null ? StringUtils.EMPTY_STRING : Constants.DATE_FORMAT
- .format(productionTimestamp));
+ .get().format(productionTimestamp));
folder.addKeyValuePair(PRODUCER_CODE, StringUtils.emptyIfNull(producerCode));
folder.addKeyValuePair(IS_MEASURED, Boolean.toString(isMeasured).toUpperCase());
folder.addKeyValuePair(OBSERVABLE_TYPE, observableTypeCode);
diff --git a/bds/source/java/ch/systemsx/cisd/bds/ExperimentRegistrationTimestamp.java b/bds/source/java/ch/systemsx/cisd/bds/ExperimentRegistrationTimestamp.java
index f722f1403e9..6a026eaebb1 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/ExperimentRegistrationTimestamp.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/ExperimentRegistrationTimestamp.java
@@ -61,7 +61,7 @@ public final class ExperimentRegistrationTimestamp implements IStorable
*/
public final void saveTo(final IDirectory directory)
{
- directory.addKeyValuePair(FILE_NAME, Constants.DATE_FORMAT.format(date));
+ directory.addKeyValuePair(FILE_NAME, Constants.DATE_FORMAT.get().format(date));
}
//
@@ -91,7 +91,7 @@ public final class ExperimentRegistrationTimestamp implements IStorable
@Override
public final String toString()
{
- return Constants.DATE_FORMAT.format(date);
+ return Constants.DATE_FORMAT.get().format(date);
}
}
diff --git a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
index eead0e4fdfc..7fa26929204 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/Utilities.java
@@ -189,7 +189,7 @@ public class Utilities
}
try
{
- return Constants.DATE_FORMAT.parse(value);
+ return Constants.DATE_FORMAT.get().parse(value);
} catch (final ParseException ex)
{
throw new DataStructureException("Value of '" + name + "' version file is not a date: "
--
GitLab