layoutBranchId is saved twice in Portal Preferences

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 6.2.X EE
• Fix Version/s: 6.2.X EE
• Component/s: Content Publishing > Staging
• Labels:
  • ee-ts
  • liferay-fixpack-portal-164-6210
• Branch Version/s:
  6.2.x
• Backported to Branch:
  Committed
• Story Points: 1.25
• Fix Priority: 2
• Git Pull Request: https://github.com/liferay/liferay-portal-ee/pull/3619
• Bug Type: Regression Bug

As BPR-4844 's outcome, StagingImpl is using 2 different ways to save layoutBranchId to the DB.

For example:
https://github.com/liferay/liferay-portal-ee/blob/cb54329061a5048a63c5c5c87cf2d7f93dfe51a7/portal-impl/src/com/liferay/portal/staging/StagingImpl.java#L1834

https://github.com/liferay/liferay-portal-ee/blob/cb54329061a5048a63c5c5c87cf2d7f93dfe51a7/portal-impl/src/com/liferay/portal/staging/StagingImpl.java#L1838

 

Steps:

Start a vanilla 6.2 with fresh DB.

Create a new site with 30 pages.

Start Staging on the site with page versioning enabled.

Select 6 pages and publish a new version of them.

Select 2 of those pages and publish a yet again.

Checkpoint: In the DB, portalpreferences table will have multiple xml name-value pairs belonging to com.liferay.portal.kernel.staging.Staging for the current user.

Examples:

com.liferay.portal.kernel.staging.Staging#layoutBranchId-#-#

com.liferay.portal.kernel.staging.Staging#layoutSetBranchId_#

 

Stop the Portal and Patch it with sp20.

Run the PortalPreferences's verify process

Verify that the DB only has one staging related xml entry with name: com.liferay.portal.kernel.staging.Staging#stagingRecentLayoutIdsMap, value is not empty.

 

Start the Portal

Publish 2 random pages.

Check the portalpreferences table.

 

Expected: Portal Preferences only has the JSON object.

Actual: Portal Preferences has both normal xml entries and the JSON object.