From f549a1f1c85f81284b786da4d4aab4f3a668c8b6 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Tue, 22 Oct 2024 14:13:31 +0200
Subject: [PATCH] fixup! JAMES-2182 MailboxManager mailbox search for specific
 other user

---
 .../org/apache/james/mailbox/store/StoreMailboxManager.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 29bd27c9bd4..6f9548fe259 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -843,9 +843,8 @@ private Flux<Mailbox> searchMailboxes(MailboxQuery mailboxQuery, MailboxSession
     }
 
     private Flux<Mailbox> getBaseMailboxes(MailboxMapper mailboxMapper,MailboxQuery mailboxQuery, MailboxSession session) {
-        if (mailboxQuery.isPrivateMailboxes(session)) {
-            return mailboxMapper.findMailboxWithPathLike(toSingleUserQuery(mailboxQuery, session));
-        } else if (mailboxQuery.getNamespace().isEmpty() && mailboxQuery.getUser().isEmpty()) {
+        if (mailboxQuery.isPrivateMailboxes(session)
+          || mailboxQuery.getNamespace().isEmpty() && mailboxQuery.getUser().isEmpty()) {
             return mailboxMapper.findMailboxWithPathLike(toSingleUserQuery(mailboxQuery, session));
         } else {
             return Flux.empty();