From 69749f9f55fa98e2b09327112cd4035c53e7efff Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 30 Aug 2011 16:22:39 +0000
Subject: [PATCH] bugfix: NPE in permanent deletion
SVN: 22727
---
.../openbis/generic/server/business/bo/DeletionTable.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java
index 29eb9866eef..e12cc1c0d7e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java
@@ -41,7 +41,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.DeletionTranslator;
*/
public class DeletionTable extends AbstractBusinessObject implements IDeletionTable
{
-
private List<Deletion> deletions;
public DeletionTable(IDAOFactory daoFactory, Session session)
@@ -58,7 +57,8 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa
{
final List<DeletionPE> deletionPEs = getDeletionDAO().listAllEntities();
Collections.sort(deletionPEs);
- if (withEntities == false)
+ deletions = DeletionTranslator.translate(deletionPEs);
+ if (false == withEntities)
{
return;
}
@@ -74,7 +74,6 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa
findSamples(findersMap, deletionIDs);
findDataSets(findersMap, deletionIDs);
}
- deletions = DeletionTranslator.translate(deletionPEs);
for (Deletion deletion : deletions)
{
findersMap.get(deletion.getId()).addRootEntitiesTo(deletion);
--
GitLab