Author: adrianc
Date: Sat Mar 9 07:30:22 2013
New Revision: 1454670
URL: http://svn.apache.org/r1454670
Log:
Merged rev 1400421 from trunk.
Fixed NPE in Content component.
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1400421
Modified:
ofbiz/branches/release12.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1454670&r1=1454669&r2=1454670&view=diff
==============================================================================
---
ofbiz/branches/release12.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
(original)
+++
ofbiz/branches/release12.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Sat Mar 9 07:30:22 2013
@@ -818,8 +818,10 @@ public class DataResourceWorker impleme
writeText(dataResource, text, templateContext, mimeTypeId, locale,
out);
} else if ("ELECTRONIC_TEXT".equals(dataResourceTypeId)) {
GenericValue electronicText = delegator.findOne("ElectronicText",
UtilMisc.toMap("dataResourceId", dataResourceId), cache);
- String text = electronicText.getString("textData");
- writeText(dataResource, text, templateContext, mimeTypeId, locale,
out);
+ if (electronicText != null) {
+ String text = electronicText.getString("textData");
+ writeText(dataResource, text, templateContext, mimeTypeId,
locale, out);
+ }
// object types
} else if (dataResourceTypeId.endsWith("_OBJECT")) {
