LPS-53005 Fixed NPE when null renderRequest is passed to getTemplateC…

…ontent
kgolebiowski · Jan 23, 2015 · ee5da78 · ee5da78
1 parent 7d258b8
commit ee5da78
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/portal-impl/src/com/liferay/portlet/dynamicdatalists/util/DDLImpl.java b/portal-impl/src/com/liferay/portlet/dynamicdatalists/util/DDLImpl.java
@@ -321,10 +321,10 @@ public String getTemplateContent(
 			recordSet.getName(themeDisplay.getLocale()));
 		contextObjects.put(TemplateConstants.TEMPLATE_ID, ddmTemplateId);
 
-		String viewMode = ParamUtil.getString(renderRequest, "viewMode");
+		String viewMode = Constants.VIEW;
 
-		if (Validator.isNull(viewMode)) {
-			viewMode = Constants.VIEW;
+		if(Validator.isNotNull(renderRequest)) {
+			viewMode = ParamUtil.getString(renderRequest, "viewMode", Constants.VIEW);
 		}
 
 		contextObjects.put("viewMode", viewMode);