XWIKI-15137: TemplateManager should not generate an empty RawBlock if the...

XWIKI-15137: TemplateManager should not generate an empty RawBlock if the result of the template execution is empty

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/template/InternalTemplateManager.java

@@ -42,6 +42,7 @@
 import javax.inject.Singleton;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.xwiki.component.annotation.Component;
 import org.xwiki.component.manager.ComponentLookupException;
@@ -582,8 +583,12 @@ private XDOM getXDOM(Template template, TemplateContent content) throws Exceptio
             xdom = this.parser.parse(content.getContent(), content.getSourceSyntax());
         } else {
             String result = evaluateContent(template, content);
-            xdom = new XDOM(Arrays.asList(new RawBlock(result,
-                content.getRawSyntax() != null ? content.getRawSyntax() : renderingContext.getTargetSyntax())));
+            if (StringUtils.isEmpty(result)) {
+                xdom = new XDOM(Collections.emptyList());
+            } else {
+                xdom = new XDOM(Arrays.asList(new RawBlock(result,
+                    content.getRawSyntax() != null ? content.getRawSyntax() : renderingContext.getTargetSyntax())));
+            }
         }
 
         return xdom;