LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Checks for null in various classes to avoid NPEs 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4544 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-01-30 20:34:53 +00:00
parent 4ed88ab09c
commit 10fcf64559
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
View File

@ -263,6 +263,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
// Prepare NEW style servlet based bebob page service // Prepare NEW style servlet based bebob page service
// //////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////
String pathInfo = sreq.getPathInfo(); String pathInfo = sreq.getPathInfo();
s_log.debug("Path info is: " + pathInfo);
final ContentItem item = getItem(section, pathInfo, itemResolver); final ContentItem item = getItem(section, pathInfo, itemResolver);

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java
View File

@ -66,6 +66,10 @@ public class GenericPersonExtraXmlGenerator implements ExtraXMLGenerator {
private void generateContactXml(final Element contactsElem, private void generateContactXml(final Element contactsElem,
final GenericContact contact, final GenericContact contact,
final PageState state) { final PageState state) {
if (contact == null) {
return;
}
//final long start = System.nanoTime(); //final long start = System.nanoTime();
final XmlGenerator generator = new XmlGenerator(contact); final XmlGenerator generator = new XmlGenerator(contact);
generator.setItemElemName("contact", ""); generator.setItemElemName("contact", "");

3
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java
View File

@ -181,6 +181,9 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
final String volumeOfSeries, final String volumeOfSeries,
final Element seriesElem, final Element seriesElem,
final PageState state) { final PageState state) {
if (series == null) {
return;
}
final XmlGenerator generator = new XmlGenerator(series); final XmlGenerator generator = new XmlGenerator(series);
generator.setItemElemName("series", ""); generator.setItemElemName("series", "");
if (volumeOfSeries != null) { if (volumeOfSeries != null) {