From d9fe7000d3ea58687cba7ed4d16ce5a4a290811d Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 4 Oct 2019 14:41:52 +0000 Subject: [PATCH] FreeMarkerPresentationManager did not handle missing application attribute (Content Center is missing it) correctly git-svn-id: https://svn.libreccm.org/ccm/trunk@6249 8810af33-2d31-482b-a856-94f89814c4df --- .../theming/FreeMarkerPresentationManager.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java b/ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java index 2fc2ad219..e91b92828 100644 --- a/ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java +++ b/ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java @@ -150,8 +150,18 @@ public class FreeMarkerPresentationManager implements PresentationManager { final NamedNodeMap pageAttrs = root.getAttributes(); final Node applicationNameAttr = pageAttrs.getNamedItem("application"); final Node applicationClassAttr = pageAttrs.getNamedItem("class"); - final String applicationName = applicationNameAttr.getNodeValue(); - final String applicationClass = applicationClassAttr.getNodeValue(); + final String applicationName; + if (applicationNameAttr == null) { + applicationName = "none"; + } else { + applicationName = applicationNameAttr.getNodeValue(); + } + final String applicationClass; + if (applicationClassAttr == null) { + applicationClass = "none"; + } else { + applicationClass = applicationClassAttr.getNodeValue(); + } final Optional applicationTemplate = findApplicationTemplate(