From 5f583c78cb5a8db7d0a12cd3e54d71321d38b592 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 14 Feb 2012 09:19:31 +0000
Subject: [PATCH] LMS-2767 Post registration
SVN: 24446
---
.../ch/systemsx/cisd/openbis/generic/server/ETLService.java | 5 ++++-
.../generic/server/dataaccess/db/PostRegistrationDAO.java | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 120d5a95485..eac12896508 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -1606,7 +1606,10 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
dataBO.loadByCode(dataSetCode);
DataPE data = dataBO.getData();
- daoFactory.getPostRegistrationDAO().removeDataSet(data);
+ if (data != null)
+ {
+ daoFactory.getPostRegistrationDAO().removeDataSet(data);
+ }
}
public List<ExternalData> listDataSetsForPostRegistration(String sessionToken,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java
index 1a4a3d8d23b..ee6ccd0a1ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java
@@ -58,8 +58,9 @@ public class PostRegistrationDAO extends AbstractGenericEntityDAO<PostRegistrati
final PostRegistrationPE pr = (PostRegistrationPE) criteria.uniqueResult();
if (operationLog.isDebugEnabled())
{
- operationLog.debug(String.format(
- "Following experiment '%s' has been found for dataSet '%s'.", pr, dataSet));
+ if (pr == null)
+ operationLog.debug(String.format(
+ "Post registration entry has been found for dataSet '%s'.", dataSet));
}
return pr;
}
--
GitLab