svn commit: r1310013 - /ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java

[le...@apache.org]

Author: lektran
Date: Thu Apr  5 18:58:15 2012
New Revision: 1310013

URL: http://svn.apache.org/viewvc?rev=1310013&view=rev
Log:
Merged from trunk r1309993:
Prevent user submitted data from being streamed directly back to the browser when the content map-key is not found.  Log a warning instead.

Modified:
    ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java

Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1310013&r1=1310012&r2=1310013&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Apr  5 18:58:15 2012
@@ -355,7 +355,7 @@ public class ContentWorker implements or
 
         if (subContent == null) {
             //throw new GeneralException("No sub-content found with map-key [" + mapKey + "] for content [" + contentId + "]");
-            out.append("<!-- no sub-content found with map-key [" + mapKey + "] for content [" + contentId + "] -->");
+            Debug.logWarning("No sub-content found with map-key [" + mapKey + "] for content [" + contentId + "]", module);
         } else {
             String subContentId = subContent.getString("contentIdTo");
             templateContext.put("mapKey", mapKey);