From 10fcf64559b64ea23a80cf00a498d14c42bbb475 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 30 Jan 2017 20:34:53 +0000
Subject: [PATCH] Checks for null in various classes to avoid NPEs

git-svn-id: https://svn.libreccm.org/ccm/trunk@4544 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java      | 1 +
 .../cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java   | 4 ++++
 .../cms/contenttypes/ui/PublicationExtraXmlGenerator.java     | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java b/ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
index 3fc3d45de..9007b7e08 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
@@ -263,6 +263,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
         // Prepare NEW style servlet based bebob page service
         // ////////////////////////////////////////////////////////////////////
         String pathInfo = sreq.getPathInfo();
+        s_log.debug("Path info is: " + pathInfo);
 
         final ContentItem item = getItem(section, pathInfo, itemResolver);
 
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java
index d943e2a50..9d706ebf6 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonExtraXmlGenerator.java
@@ -66,6 +66,10 @@ public class GenericPersonExtraXmlGenerator implements ExtraXMLGenerator {
     private void generateContactXml(final Element contactsElem,
                                     final GenericContact contact,
                                     final PageState state) {
+        if (contact == null) {
+            return;
+        }
+
         //final long start = System.nanoTime();
         final XmlGenerator generator = new XmlGenerator(contact);
         generator.setItemElemName("contact", "");
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java
index c227e1842..57fa49213 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java
@@ -181,6 +181,9 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator {
                                      final String volumeOfSeries,
                                      final Element seriesElem,
                                      final PageState state) {
+        if (series == null) {
+            return;
+        }
         final XmlGenerator generator = new XmlGenerator(series);
         generator.setItemElemName("series", "");
         if (volumeOfSeries != null) {