From 0cdf0d906e44aad66649e07dd82aed16a29ed512 Mon Sep 17 00:00:00 2001 From: tpylak <tpylak> Date: Fri, 18 Sep 2009 18:12:58 +0000 Subject: [PATCH] SE-143 YeastX: 1) bugfix (group code was taken instead of exp. code) 2) change error to warning if it will be retried SVN: 12668 --- .../generic/shared/utils/AbstractDatasetDropboxHandler.java | 5 +++-- .../cisd/openbis/generic/shared/dto/DatasetDescription.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java index 178f446afbe..23ca765714c 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java @@ -154,9 +154,10 @@ abstract public class AbstractDatasetDropboxHandler implements Serializable fileOperations.copyToDirectoryAs(source, destDir, newName); } catch (IOExceptionUnchecked ex) { - operationLog.error(createCopyErrorMessage(source, destDir, + operationLog.warn(createCopyErrorMessage(source, destDir, newName) - + ": " + ex.getMessage()); + + ". Operation will be retried. Details: " + + ex.getMessage()); return null; } return Boolean.TRUE; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java index ed7ae1e30ab..bb1aaef5a3e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java @@ -49,7 +49,7 @@ public class DatasetDescription implements Serializable this.sampleCode = sampleCode; this.groupCode = groupCode; this.projectCode = projectCode; - this.groupCode = groupCode; + this.experimentCode = experimentCode; } public String getDataSetLocation() -- GitLab