Author: bpoussin Date: 2012-06-22 18:07:13 +0200 (Fri, 22 Jun 2012) New Revision: 184 Url: http://chorem.org/repositories/revision/chorem/184 Log: fix null pointer when field collection is null Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-06-20 15:25:47 UTC (rev 183) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-06-22 16:07:13 UTC (rev 184) @@ -160,9 +160,11 @@ String id = wikitty.getId() + "-" + extName + "-" + fieldName; List<String> values = wikitty.getFieldAsList(extName, fieldName, String.class); /*{<%=fieldName%> : <ul>}*/ - for (String value : values) { - if (value != null) { - /*{<li><%=value%></li>}*/ + if (values != null) { + for (String value : values) { + if (value != null) { + /*{<li><%=value%></li>}*/ + } } } /*{</ul>}*/ @@ -181,10 +183,12 @@ throws JspException, IOException { List<Wikitty> values = wikitty.getFieldAsWikittyList(extName, fieldName, false); /*{<%=fieldName%> : <ul>}*/ - for (Wikitty value : values) { - if (value != null) { - String url = contextPath + "/wikitty/view/" + value.getId(); - /*{<li><a href="<%=url%>"><%=value%></a></li>}*/ + if (values != null) { + for (Wikitty value : values) { + if (value != null) { + String url = contextPath + "/wikitty/view/" + value.getId(); + /*{<li><a href="<%=url%>"><%=value%></a></li>}*/ + } } } /*{</ul>}*/