From ee5da780b239b3f7450a3aeca64f578d11bbde02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Go=C5=82e=CC=A8biowski?= Date: Sat, 24 Jan 2015 00:01:42 +0100 Subject: [PATCH] LPS-53005 Fixed NPE when null renderRequest is passed to getTemplateContent --- .../com/liferay/portlet/dynamicdatalists/util/DDLImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 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 index c8d4e994ad13e3..d2d8619dcf5327 100644 --- 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);