Author: mfortun Date: 2011-09-06 11:19:25 +0200 (Tue, 06 Sep 2011) New Revision: 1229 Url: http://nuiton.org/repositories/revision/wikitty/1229 Log: correct NPE Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-02 14:11:39 UTC (rev 1228) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-06 09:19:25 UTC (rev 1229) @@ -112,7 +112,9 @@ WikittyPublicationSession result = (WikittyPublicationSession) httpSession .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { + if (result == null + || (result.getContext() != null && !result.getContext().equals( + contextData))) { result = new WikittyPublicationSession(contextData); httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); @@ -140,7 +142,9 @@ WikittyPublicationSession result = (WikittyPublicationSession) session .get(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { + if (result == null + || (result.getContext() != null && !result.getContext().equals( + contextData))) { result = new WikittyPublicationSession(contextData); session.put(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result);