Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java	(revision 1796981)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java	(revision )
@@ -43,12 +43,14 @@
     private final UserManagerImpl userManager;
     private final Root root;
     private final AuthorizableType targetType;
+    private final String[] selectorNames;
 
     ResultRowToAuthorizable(@Nonnull UserManagerImpl userManager, @Nonnull Root root,
-                            @Nullable AuthorizableType targetType) {
+                            @Nullable AuthorizableType targetType, @Nonnull String[] selectorNames) {
         this.userManager = userManager;
         this.root = root;
         this.targetType = (targetType == null || AuthorizableType.AUTHORIZABLE == targetType) ? null : targetType;
+        this.selectorNames = selectorNames;
     }
 
     @Nullable
@@ -62,7 +64,7 @@
     private Authorizable getAuthorizable(@CheckForNull ResultRow row) {
         Authorizable authorizable = null;
         if (row != null) {
-            String resultPath = row.getPath();
+            String resultPath = row.getPath(getSelectorName());
             try {
                 Tree tree = root.getTree(resultPath);
                 AuthorizableType type = UserUtil.getType(tree);
@@ -78,5 +80,14 @@
             }
         }
         return authorizable;
+    }
+
+    @Nullable
+    private String getSelectorName() {
+        if (selectorNames.length >- 1) {
+            return selectorNames[0];
+        } else {
+            return null;
+        }
     }
 }
\ No newline at end of file
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java	(revision 1797008)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java	(revision )
@@ -39,7 +39,6 @@
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -197,7 +196,6 @@
         assertResultContainsAuthorizables(result);
     }
 
-    @Ignore("OAK-6290")
     @Test
     public void testFindWithRelPathMultipleSelectorNames() throws Exception {
         user.setProperty(propertyName, v);
\ No newline at end of file
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java	(revision 1797008)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java	(revision )
@@ -277,7 +277,7 @@
                     statement, javax.jcr.query.Query.XPATH, limit, offset,
                     NO_BINDINGS, namePathMapper.getSessionLocalMappings());
             Iterable<? extends ResultRow> resultRows = query.getRows();
-            Iterator<Authorizable> authorizables = Iterators.transform(resultRows.iterator(), new ResultRowToAuthorizable(userManager, root, type));
+            Iterator<Authorizable> authorizables = Iterators.transform(resultRows.iterator(), new ResultRowToAuthorizable(userManager, root, type, query.getColumnSelectorNames()));
             return Iterators.filter(authorizables, new UniqueResultPredicate());
         } catch (ParseException e) {
             log.warn("Invalid user query: " + statement, e);