You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/05/16 13:12:29 UTC
svn commit: r1679728 -
/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Author: deepak
Date: Sat May 16 11:12:29 2015
New Revision: 1679728
URL: http://svn.apache.org/r1679728
Log:
Applied patch from jira issue OFBIZ-6329 : Malfunction of configurable FTL-Template caching in DataResourceWorker.renderDataResourceAsText
Thanks Martin Becker for reporting the issue and providing the patch.
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1679728&r1=1679727&r2=1679728&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sat May 16 11:12:29 2015
@@ -620,29 +620,6 @@ public class DataResourceWorker impleme
locale = Locale.getDefault();
}
- // check for a cached template
- if (cache) {
- String disableCache = EntityUtilProperties.getPropertyValue("content", "disable.ftl.template.cache", delegator);
- if (disableCache == null || !disableCache.equalsIgnoreCase("true")) {
- try {
- Template cachedTemplate = FreeMarkerWorker.getTemplate(delegator.getDelegatorName() + ":DataResource:" + dataResourceId);
- if (cachedTemplate != null) {
- String subContentId = (String) templateContext.get("subContentId");
- if (UtilValidate.isNotEmpty(subContentId)) {
- templateContext.put("contentId", subContentId);
- templateContext.put("subContentId", null);
- templateContext.put("globalNodeTrail", null); // Force getCurrentContent to query for subContent
- }
- FreeMarkerWorker.renderTemplate(cachedTemplate, templateContext, out);
- }
- } catch (TemplateException e) {
- Debug.logError("Error rendering FTL template. " + e.getMessage(), module);
- throw new GeneralException("Error rendering FTL template", e);
- }
- return;
- }
- }
-
// if the target mimeTypeId is not a text type, throw an exception
if (!targetMimeTypeId.startsWith("text/")) {
throw new GeneralException("The desired mime-type is not a text type, cannot render as text: " + targetMimeTypeId);
@@ -662,7 +639,7 @@ public class DataResourceWorker impleme
// no template; or template is NONE; render the data
if (UtilValidate.isEmpty(dataTemplateTypeId) || "NONE".equals(dataTemplateTypeId)) {
- DataResourceWorker.writeDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, out, true);
+ DataResourceWorker.writeDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, out, cache);
} else {
// a template is defined; render the template first
templateContext.put("mimeTypeId", targetMimeTypeId);
@@ -687,7 +664,8 @@ public class DataResourceWorker impleme
}
// render the FTL template
- FreeMarkerWorker.renderTemplate(delegator.getDelegatorName() + ":DataResource:" + dataResourceId, templateText, templateContext, out);
+ boolean useTemplateCache = cache && !UtilProperties.getPropertyAsBoolean("content", "disable.ftl.template.cache", false);
+ FreeMarkerWorker.renderTemplate(delegator.getDelegatorName() + ":DataResource:" + dataResourceId, templateText, templateContext, out, useTemplateCache);
} catch (TemplateException e) {
throw new GeneralException("Error rendering FTL template", e);
}