| commit | 8a25e22d7e82bdd7e27ec05a6f6698445bd13ff7 | [log] [tgz] |
|---|---|---|
| author | Jacek Centkowski <geminica.programs@gmail.com> | Fri Dec 30 13:57:09 2022 +0100 |
| committer | Jacek Centkowski <geminica.programs@gmail.com> | Fri Dec 30 13:57:09 2022 +0100 |
| tree | 22be2c7614f659fe2e5107569d0d413a3f84adb1 | |
| parent | cd4c46c740f3d5967c4e3bd1dda208013ec0ec45 [diff] | |
| parent | 1485f6cef0183564891a112454104c3780001301 [diff] |
Merge branch 'stable-3.3' into stable-3.5 * stable-3.3: Don't attempt to cache refs containing '[:|@]' in resolve call Change-Id: I6c6edcd07018ed4fad9d8f64fa30c0fe3514840d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java index a273e70..e527725 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java +++ b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedGitRepositoryManager.java
@@ -60,4 +60,9 @@ LocalDiskRepositoryManager getRepoManager() { return repoManager; } + + @Override + public Status getRepositoryStatus(Project.NameKey name) { + return repoManager.getRepositoryStatus(name); + } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java index d5b5337..6710188 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/cachedrefdb/CachedRefRepository.java
@@ -183,7 +183,7 @@ } @Override - public Set<ObjectId> getAdditionalHaves() { + public Set<ObjectId> getAdditionalHaves() throws IOException { return delegate.getAdditionalHaves(); } @@ -206,7 +206,7 @@ } @Override - public Map<AnyObjectId, Set<Ref>> getAllRefsByPeeledObjectId() { + public Map<AnyObjectId, Set<Ref>> getAllRefsByPeeledObjectId() throws IOException { return delegate.getAllRefsByPeeledObjectId(); }