Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  AccountCacheImpl: Don't return null on error but Optional.empty()

Change-Id: I94e746d9566780b6976d4d665d02946cb0a8c047

1 files changed, 2 insertions, 2 deletions

diff --git a/java/com/google/gerrit/server/account/AccountCacheImpl.java b/java/com/google/gerrit/server/account/AccountCacheImpl.java
index fd48fa7e67..acd7bd358a 100644
--- a/java/com/google/gerrit/server/account/AccountCacheImpl.java
+++ b/java/com/google/gerrit/server/account/AccountCacheImpl.java
@@ -101,7 +101,7 @@ public class AccountCacheImpl implements AccountCache {
       return byId.get(accountId);
     } catch (ExecutionException e) {
       logger.atWarning().withCause(e).log("Cannot load AccountState for ID %s", accountId);
-      return null;
+      return Optional.empty();
     }
   }
 
@@ -149,7 +149,7 @@ public class AccountCacheImpl implements AccountCache {
           .orElseGet(Optional::empty);
     } catch (IOException | ConfigInvalidException e) {
       logger.atWarning().withCause(e).log("Cannot load AccountState for username %s", username);
-      return null;
+      return Optional.empty();
     }
   }