Author: sletellier Date: 2010-12-24 12:05:31 +0100 (Fri, 24 Dec 2010) New Revision: 660 Url: http://nuiton.org/repositories/revision/wikitty/660 Log: NPE on wikittyServiceSecurity on delete Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-24 10:21:27 UTC (rev 659) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-24 11:05:31 UTC (rev 660) @@ -418,11 +418,13 @@ List<String> idsAsList = new ArrayList<String>(ids); List<Wikitty> wikitties = getDelegate().restore(securityToken, idsAsList); for (Wikitty wikitty : wikitties) { - for (String extensionName : wikitty.getExtensionNames()) { - if ( ! canWrite(securityToken, userId, extensionName, wikitty)) { - throw new SecurityException(_( - "user %s doesn't have rights on extension %s on wikitty %s", - userId, extensionName, wikitty)); + if (wikitty != null) { + for (String extensionName : wikitty.getExtensionNames()) { + if ( ! canWrite(securityToken, userId, extensionName, wikitty)) { + throw new SecurityException(_( + "user %s doesn't have rights on extension %s on wikitty %s", + userId, extensionName, wikitty)); + } } } }