Steps to reproduce:

• Create a Page "page-1" in siteaccess Banana
• Log out (destroy the session)
• Log in siteaccess Banana admin
• Edit the created Page from the dashboard (without opening the preview before)
• See that the page is trying to be loaded from http://apple/page-1

Expected behaviour: The page must be loaded from http://banana/page-1

This comes most probably from the refactoring in EZP-32157

As you can see in the NonAdminSiteaccessResolver class, the matching is done only on the location id and language (which is not unique in this case).

As soon as the preview was opened once, the right siteaccess is stored in the session and it works as expected until the next logout.