LPD-93387 SF

Author: brianchandotcom

modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/service/impl/CTCollectionLocalServiceImpl.java

@@ -548,7 +548,6 @@ public CTCollection deleteCTCollection(CTCollection ctCollection)
 			ctCollection.getCtCollectionId());
 
 		Set<Serializable> ctEntryPrimaryKeys = new HashSet<>();
-
 		int entityCacheThreshold = _getEntityCacheThreshold();
 
 		try (SafeCloseable safeCloseable =
@@ -1380,10 +1379,9 @@ private void _discardCTEntries(
 				return null;
 			});
 
-		List<Long> modelClassPKs = new ArrayList<>(ctEntries.size());
 		Set<Serializable> ctEntryPrimaryKeys = new HashSet<>();
-
 		int entityCacheThreshold = _getEntityCacheThreshold();
+		List<Long> modelClassPKs = new ArrayList<>(ctEntries.size());
 
 		try (SafeCloseable safeCloseable =
 				SkipReplicationThreadLocal.setEnabledWithSafeCloseable(

modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/background/task/test/CTPublishBackgroundTaskExecutorTest.java

@@ -68,9 +68,7 @@ public void tearDown() throws Exception {
 	}
 
 	@Test
-	public void testExecuteDoesNotClearEntityCacheWhenNotClustered()
-		throws Exception {
-
+	public void testExecute() throws Exception {
 		Assert.assertFalse(ClusterExecutorUtil.isEnabled());
 
 		_addDLFileEntries(5);