[sling-org-apache-sling-testing-sling-mock-oak] branch master updated: SLING-11572 workaround if a service resource resolver calls isResourceType()

[sseifert]

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git


The following commit(s) were added to refs/heads/master by this push:
     new b16be86  SLING-11572 workaround if a service resource resolver calls 
isResourceType()
b16be86 is described below

commit b16be8662853bf2e9b9de577a5e9f8f3c769c41d
Author: Stefan Seifert <stefanseif...@users.noreply.github.com>
AuthorDate: Fri Sep 9 15:07:29 2022 +0200

    SLING-11572 workaround if a service resource resolver calls isResourceType()
---
 .../apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
 
b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
index a078deb..c30dfe4 100644
--- 
a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
+++ 
b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
@@ -139,6 +139,10 @@ public final class OakMockSlingRepository implements 
SlingRepository {
 
     public Session login(Credentials credentials, String workspaceName)
             throws LoginException, NoSuchWorkspaceException, 
RepositoryException {
+        if (credentials == null) {
+            // SLING-11572 workaround if a service resource resolver calls 
isResourceType()
+            return this.loginAdministrative(workspaceName);
+        }
         return repository.login(credentials, (workspaceName == null ? 
getDefaultWorkspace() : workspaceName));
     }