This is an automated email from the ASF dual-hosted git repository. jsedding pushed a change to branch fix/SLING-12019-duplicate-ResourceResolverFactory-registration in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
from c0b50ee Merge remote-tracking branch 'origin/master' into fix/SLING-12019-duplicate-ResourceResolverFactory-registration add 57eddc5 SLING-12019 - Avoid duplicate ResourceResolverFactory registrations No new revisions were added by this update. Summary of changes: .../impl/FactoryRegistrationHandler.java | 43 ++-- .../impl/ResourceResolverFactoryActivator.java | 1 + .../impl/EtcMappingResourceResolverTest.java | 6 + .../impl/FactoryRegistrationHandlerTest.java | 181 ++++++++++++++ .../impl/MockedResourceResolverImplTest.java | 275 +++++++++++---------- .../mapping/AbstractMappingMapEntriesTest.java | 6 +- .../impl/mapping/InMemoryResourceProvider.java | 2 +- 7 files changed, 361 insertions(+), 153 deletions(-) create mode 100644 src/test/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandlerTest.java