svn commit: r1643088 - in /ofbiz/trunk: applications/content/src/org/ofbiz/content/data/DataResourceWorker.java framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java

[jacopoc]

Author: jacopoc
Date: Wed Dec  3 10:51:52 2014
New Revision: 1643088

URL: http://svn.apache.org/r1643088
Log:
OFBIZ-5894 When ContentWorker.renderContentAsText is used to render content 
that have electronicText with empty textData then it renders a string with the 
"null" value: this commit fix the issue. Thanks to Deepak Dixit for the bug 
report and fix.

Modified:
    
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
    
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.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=1643088&r1=1643087&r2=1643088&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
 Wed Dec  3 10:51:52 2014
@@ -914,9 +914,13 @@ public class DataResourceWorker  impleme
                 mimeContext.put("textData", textData);
 
                 String mimeString = 
DataResourceWorker.renderMimeTypeTemplate(mimeTypeTemplate, mimeContext);
-                out.append(mimeString);
+                if (mimeString != null) {
+                    out.append(mimeString);
+                }
             } else {
-                out.append(textData);
+                if (textData != null) {
+                    out.append(textData);
+                }
             }
         } else {
             out.append(textData);

Modified: 
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1643088&r1=1643087&r2=1643088&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
 (original)
+++ 
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
 Wed Dec  3 10:51:52 2014
@@ -180,7 +180,7 @@ public class FreeMarkerWorker {
      * @param useCache try to get template from cache
      */
     public static void renderTemplate(String templateLocation, String 
templateString, Map<String, Object> context, Appendable outWriter, boolean 
useCache) throws TemplateException, IOException {
-        if (UtilValidate.isEmpty(templateString)) {
+        if (templateString == null) {
             renderTemplate(templateLocation, context, outWriter);
         } else {
             renderTemplateFromString(templateString, templateLocation, 
context, outWriter, useCache);