[SLING-6131] MapEntries: Invalid logic around added/changed/removed property names

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Fix Version/s: Resource Resolver 1.5.0
• Component/s: ResourceResolver
• Assignee: Carsten Ziegeler
• Reporter: Bertrand Delacretaz
• Created: 11/Oct/16 14:12
• Updated: 21/Feb/17 14:53
• Resolved: 12/Oct/16 08:19

Description

The SLING-6000 changes have introduced code that looks incorrect and breaks a number of integration tests (MappingEventsProxyTest, ResourceResolverProxyTest, VanityPathTest) as (for example) changing a single property of a map entry does not cause MapEntries to send events anymore.

In the affected code below, from the MapEntries class, the changedAttributes and removedAttributes section are not reached if addedAttributes is null, I don't think that's intentional.

cziegeler could you have a look? I have assigned this to you as IIUC you wrote that SLING-6000 code.

This is blocking SLING-5135 but I'll commit that code and disable the affected integration tests until this is fixed.

Set<String> addedAttributes = rc.getAddedPropertyNames();
if (addedAttributes != null) {
  ...
  wasResolverRefreshed = doAddAttributes(path, addedAttributes, wasResolverRefreshed);
  ...
  Set<String> changedAttributes = rc.getChangedPropertyNames();
  ...
  Set<String> removedAttributes = rc.getRemovedPropertyNames();
} else {

Issue Links

• breaks: SLING-6542 MapEntries' concurrent session access broken