Author: bpoussin Date: 2010-10-21 12:47:18 +0200 (Thu, 21 Oct 2010) New Revision: 443 Url: http://nuiton.org/repositories/revision/wikitty/443 Log: restore null id return null http://www.nuiton.org/issues/show/792 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 10:37:21 UTC (rev 442) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-21 10:47:18 UTC (rev 443) @@ -163,6 +163,9 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { + if (id == null) { + return null; + } E result = null; HashSet<String> extNames = null; try { @@ -203,6 +206,10 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public Wikitty restore(String id) { + if (id == null) { + return null; + } + Wikitty wikitty = wikittyService.restore(securityToken, id); return wikitty; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:37:21 UTC (rev 442) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-21 10:47:18 UTC (rev 443) @@ -414,6 +414,9 @@ protected Wikitty restore(String securityToken, WikittyTransaction transaction, String id) { + if (id == null) { + return null; + } if (!getWikittyStorage().exists(transaction, id)) { // object doesn't exist, we return null return null;