Author: bpoussin Date: 2012-03-05 19:57:02 +0100 (Mon, 05 Mar 2012) New Revision: 1441 Url: http://nuiton.org/repositories/revision/wikitty/1441 Log: Modification de l'implantation du InMemory pour que le delete fonctionne convenablement avec le copy on write des wikitties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-03-05 11:46:38 UTC (rev 1440) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-03-05 18:57:02 UTC (rev 1441) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.storage; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; @@ -107,8 +108,8 @@ WikittyEvent result = new WikittyEvent(this); Date now = new Date(); for (String id : idList) { - Wikitty w = restore(transaction, id); - if (w != null) { + Wikitty w = wikitties.get(id); + if (w != null && !w.isDeleted()) { w.setDeleteDate(now); result.addRemoveDate(id, now); }