Skip to content
Snippets Groups Projects
Commit 69749f9f authored by kaloyane's avatar kaloyane
Browse files

bugfix: NPE in permanent deletion

SVN: 22727
parent 5e7c418d
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.DeletionTranslator; ...@@ -41,7 +41,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.DeletionTranslator;
*/ */
public class DeletionTable extends AbstractBusinessObject implements IDeletionTable public class DeletionTable extends AbstractBusinessObject implements IDeletionTable
{ {
private List<Deletion> deletions; private List<Deletion> deletions;
public DeletionTable(IDAOFactory daoFactory, Session session) public DeletionTable(IDAOFactory daoFactory, Session session)
...@@ -58,7 +57,8 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa ...@@ -58,7 +57,8 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa
{ {
final List<DeletionPE> deletionPEs = getDeletionDAO().listAllEntities(); final List<DeletionPE> deletionPEs = getDeletionDAO().listAllEntities();
Collections.sort(deletionPEs); Collections.sort(deletionPEs);
if (withEntities == false) deletions = DeletionTranslator.translate(deletionPEs);
if (false == withEntities)
{ {
return; return;
} }
...@@ -74,7 +74,6 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa ...@@ -74,7 +74,6 @@ public class DeletionTable extends AbstractBusinessObject implements IDeletionTa
findSamples(findersMap, deletionIDs); findSamples(findersMap, deletionIDs);
findDataSets(findersMap, deletionIDs); findDataSets(findersMap, deletionIDs);
} }
deletions = DeletionTranslator.translate(deletionPEs);
for (Deletion deletion : deletions) for (Deletion deletion : deletions)
{ {
findersMap.get(deletion.getId()).addRootEntitiesTo(deletion); findersMap.get(deletion.getId()).addRootEntitiesTo(deletion);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment