ZBUG-4317: Autocomplete Failure after updating to 10.1.1

Zimbra · Oct 10, 2024 · 518430b · 518430b
1 parent cf77372
commit 518430b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/store/src/java/com/zimbra/cs/account/Provisioning.java b/store/src/java/com/zimbra/cs/account/Provisioning.java
@@ -634,7 +634,9 @@ public AlwaysOnCluster getAlwaysOnCluster(Server server) throws ServiceException
      */
     public String getEmailAddrByDomainAlias(String emailAddress) throws ServiceException {
         String addr = null;
-
+        if (StringUtil.isNullOrEmpty(emailAddress)) {
+            return null;
+        }
         String parts[] = emailAddress.split("@");
         if (parts.length == 2) {
             Domain domain = getDomain(Key.DomainBy.name, parts[1], true);

diff --git a/store/src/java/com/zimbra/cs/account/ldap/LdapProvisioning.java b/store/src/java/com/zimbra/cs/account/ldap/LdapProvisioning.java
@@ -1163,6 +1163,9 @@ private Account getAppAdminAccountByName(String name, boolean loadFromMaster)
     }
 
     private String fixupAccountName(String emailAddress) throws ServiceException {
+        if (StringUtil.isNullOrEmpty(emailAddress)) {
+            return null;
+        }
         int index = emailAddress.indexOf('@');
         String domain = null;
         if (index == -1) {
@@ -1205,7 +1208,9 @@ Account getAccountByName(String emailAddress, boolean loadFromMaster, boolean ch
 
     private Account getAccountByNameInternal(String emailAddress, boolean loadFromMaster)
     throws ServiceException {
-
+        if (StringUtil.isNullOrEmpty(emailAddress)) {
+            return null;
+        }
         emailAddress = fixupAccountName(emailAddress);
 
         Account account = accountCache.getByName(emailAddress);