opendev/gerrit
Code Issues Proposed changes

Propagate IOException in TagMatcher

Browse Source 
This causes a 500 rather than silently omitting a tag from the ref
advertisement.

Change-Id: I868dd65b285a9b5cd8ce37152d89f086e692f605
This commit is contained in:
Han-Wen Nienhuys
2019-01-07 17:37:20 +01:00
parent 978ba376f2
commit 35b206c5ef
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/com/google/gerrit/server/git/TagMatcher.java
View File

@@ -51,13 +51,8 @@ public class TagMatcher {
this.updated = updated; this.updated = updated;
} }
public boolean isReachable(Ref tagRef) { public boolean isReachable(Ref tagRef) throws IOException {
try { tagRef = db.getRefDatabase().peel(tagRef);
tagRef = db.getRefDatabase().peel(tagRef);
} catch (IOException e) {
// Ignore
}
ObjectId tagObj = tagRef.getPeeledObjectId(); ObjectId tagObj = tagRef.getPeeledObjectId();
if (tagObj == null) { if (tagObj == null) {
tagObj = tagRef.getObjectId(); tagObj = tagRef.getObjectId();

8
java/com/google/gerrit/server/permissions/DefaultRefFilter.java
View File

@@ -255,8 +255,12 @@ class DefaultRefFilter {
.values() .values()
: result.values()); : result.values());
for (Ref tag : deferredTags) { for (Ref tag : deferredTags) {
if (tags.isReachable(tag)) { try {
result.put(tag.getName(), tag); if (tags.isReachable(tag)) {
result.put(tag.getName(), tag);
}
} catch (IOException e) {
throw new PermissionBackendException(e);
} }
} }
} }