Author: sletellier Date: 2010-08-11 17:27:25 +0200 (Wed, 11 Aug 2010) New Revision: 246 Url: http://nuiton.org/repositories/revision/wikitty/246 Log: Fix npe on restore Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-11 14:47:13 UTC (rev 245) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-11 15:27:25 UTC (rev 246) @@ -87,6 +87,9 @@ * @param e */ public void putWikitty(Wikitty e) { + if (e == null) { + return; + } Wikitty old = getWikitty(e.getId()); if (old == null || WikittyUtil.versionGreaterThan(e.getVersion(), old.getVersion())) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-11 14:47:13 UTC (rev 245) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-11 15:27:25 UTC (rev 246) @@ -372,8 +372,10 @@ cache.putAllWikitty(missingInCache); for (Wikitty w : missingInCache) { - // add missing object - fromCache.put(w.getId(), w); + if (w != null) { + // add missing object + fromCache.put(w.getId(), w); + } } Collection<Wikitty> tmp = fromCache.values();