LPD-32570 SF, move variable declaration

brianikim · Aug 6, 2024 · 7f697e0 · 7f697e0
1 parent 7b1011c
commit 7f697e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/...va/com/liferay/site/navigation/admin/web/internal/util/SiteNavigationMenuPortletUtil.java b/...va/com/liferay/site/navigation/admin/web/internal/util/SiteNavigationMenuPortletUtil.java
@@ -38,8 +38,7 @@ public static OrderByComparator<SiteNavigationMenu> getOrderByComparator(
 		}
 
 		if (orderByCol.equals("create-date")) {
-			oreturn
-			new SiteNavigationMenuCreateDateComparator(orderByAsc);
+			return new SiteNavigationMenuCreateDateComparator(orderByAsc);
 		}
 		else if (orderByCol.equals("name")) {
 			return new SiteNavigationMenuNameComparator(orderByAsc);

diff --git a/.../wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/portlet/action/ActionUtil.java b/.../wiki/wiki-web/src/main/java/com/liferay/wiki/web/internal/portlet/action/ActionUtil.java
@@ -282,23 +282,23 @@ public static String getHtmlDiffResult(
 	public static WikiNode getNode(PortletRequest portletRequest)
 		throws Exception {
 
-		HttpServletRequest httpServletRequest =
-			PortalUtil.getHttpServletRequest(portletRequest);
-
-		ThemeDisplay themeDisplay =
-			(ThemeDisplay)httpServletRequest.getAttribute(
-				WebKeys.THEME_DISPLAY);
+		WikiNode node = null;
 
 		long nodeId = ParamUtil.getLong(portletRequest, "nodeId");
 		String nodeName = ParamUtil.getString(portletRequest, "nodeName");
 
-		WikiNode node = null;
-
 		try {
 			if (nodeId > 0) {
 				node = WikiNodeServiceUtil.getNode(nodeId);
 			}
 			else if (Validator.isNotNull(nodeName)) {
+				HttpServletRequest httpServletRequest =
+					PortalUtil.getHttpServletRequest(portletRequest);
+
+				ThemeDisplay themeDisplay =
+					(ThemeDisplay)httpServletRequest.getAttribute(
+						WebKeys.THEME_DISPLAY);
+
 				node = WikiNodeServiceUtil.getNode(
 					themeDisplay.getScopeGroupId(), nodeName);
 			}