| commit | f49236d1b697bef4566914d9717ac22222d05c40 | [log] [tgz] |
|---|---|---|
| author | Sven Selberg <svense@axis.com> | Wed Dec 22 14:33:04 2021 +0100 |
| committer | Sven Selberg <svense@axis.com> | Wed Dec 22 14:33:04 2021 +0100 |
| tree | 07cdc4acc8ebdd6a31a7b69ffa14d2ab365531a0 | |
| parent | b74beeee4466be0be7685fb176a1c6b3f330755c [diff] | |
| parent | a4a681d728566eeac188fc81521b0b28067d3610 [diff] |
Merge branch 'stable-3.3' into master * branch 'stable-3.3': Adjust to broken ProjectCache API Bug: Issue 15477 Change-Id: I3581d2d57adf2ad7ddf9a3ccda5801687588ecd5
diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/LockUnlockProject.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/LockUnlockProject.java index 91f4d9e..91f018f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/LockUnlockProject.java +++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/LockUnlockProject.java
@@ -49,7 +49,7 @@ md.setMessage(String.format("Lock project while renaming the project %s\n", key.get())); projectConfig.commit(md); Project p = projectConfig.getProject(); - projectCache.evict(p); + projectCache.evict(p.getNameKey()); } public void unlock(Project.NameKey key) throws IOException, ConfigInvalidException { @@ -61,6 +61,6 @@ md.setMessage(String.format("Unlock project after renaming the project to %s\n", key.get())); projectConfig.commit(md); Project p = projectConfig.getProject(); - projectCache.evict(p); + projectCache.evict(p.getNameKey()); } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/renameproject/SubmoduleUtil.java b/src/test/java/com/googlesource/gerrit/plugins/renameproject/SubmoduleUtil.java index fd59126..f6798b1 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/renameproject/SubmoduleUtil.java +++ b/src/test/java/com/googlesource/gerrit/plugins/renameproject/SubmoduleUtil.java
@@ -76,7 +76,7 @@ ObjectId oldId = pc.getRevision(); ObjectId newId = pc.commit(md); assertThat(newId).isNotEqualTo(oldId); - projectCache.evict(pc.getProject()); + projectCache.evict(pc.getName()); } }