LPS-126145 Move this changes to the proper UserNotificationHandler im…

…plementation.
laszlopap · Feb 11, 2021 · 823fed1 · 823fed1
1 parent ff462fa
commit 823fed1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/...n/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java b/...n/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java
@@ -14,7 +14,9 @@
 
 package com.liferay.comment.web.internal.notifications;
 
+import com.liferay.asset.kernel.AssetRendererFactoryRegistryUtil;
 import com.liferay.asset.kernel.model.AssetRenderer;
+import com.liferay.asset.kernel.model.AssetRendererFactory;
 import com.liferay.comment.web.internal.constants.CommentPortletKeys;
 import com.liferay.message.boards.model.MBDiscussion;
 import com.liferay.message.boards.service.MBDiscussionLocalService;
@@ -76,8 +78,28 @@ protected AssetRenderer<?> getAssetRenderer(JSONObject jsonObject) {
 			return null;
 		}
 
-		return getAssetRenderer(
+		AssetRenderer<?> assetRenderer = getAssetRenderer(
 			mbDiscussion.getClassName(), mbDiscussion.getClassPK());
+
+		if (assetRenderer == null) {
+			try {
+				AssetRendererFactory<?> assetRendererFactory =
+					AssetRendererFactoryRegistryUtil.
+						getAssetRendererFactoryByClassName(
+							mbDiscussion.getClassName());
+
+				assetRenderer = assetRendererFactory.getAssetRenderer(
+					mbDiscussion.getClassPK(),
+					AssetRendererFactory.TYPE_LATEST);
+			}
+			catch (Exception exception) {
+				if (_log.isDebugEnabled()) {
+					_log.debug(exception, exception);
+				}
+			}
+		}
+
+		return assetRenderer;
 	}
 
 	@Override

diff --git a/...-kernel/src/com/liferay/portal/kernel/notifications/BaseModelUserNotificationHandler.java b/...-kernel/src/com/liferay/portal/kernel/notifications/BaseModelUserNotificationHandler.java
@@ -63,24 +63,14 @@ protected AssetRenderer<?> getAssetRenderer(
 		AssetRenderer<?> assetRenderer = null;
 
 		try {
-			assetRenderer = assetRendererFactory.getAssetRenderer(
-				classPK, AssetRendererFactory.TYPE_LATEST_APPROVED);
+			assetRenderer = assetRendererFactory.getAssetRenderer(classPK);
 		}
 		catch (Exception exception) {
 			if (_log.isDebugEnabled()) {
 				_log.debug(exception, exception);
 			}
 		}
 
-		if (assetRenderer == null) {
-			try {
-				assetRenderer = assetRendererFactory.getAssetRenderer(
-					classPK, AssetRendererFactory.TYPE_LATEST);
-			}
-			catch (Exception exception) {
-			}
-		}
-
 		return assetRenderer;
 	}