From 8904160d673e40bbc3bff6b5f79adcb86a4a0910 Mon Sep 17 00:00:00 2001 From: Samuel Pelletier Date: Fri, 11 Dec 2015 20:33:32 -0500 Subject: [PATCH] Fix an NPE. --- .../Sources/er/extensions/components/ERXWOComponentContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java index 5e5357ff5da..b5704dc33cd 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java @@ -154,7 +154,7 @@ private WOElement template(WOComponent component) { WOElement content = component._childTemplate(); WOElement result = null; String templateName = (_templateName == null) ? null : (String) _templateName.valueInComponent(component); - if (content.getClass() == WODynamicGroup.class) { + if (content != null && content.getClass() == WODynamicGroup.class) { WODynamicGroup group = (WODynamicGroup) content; if (templateName == null) { // MS: If you don't set a template name, then let's construct all the children of