opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  PatchFile: Fix getting comment context for left side
  Revert "Allow load labels to cross package boundaries by default"
  CommentSender: Add line number in debug log

Change-Id: I7cc5200a389bd4ff62a399537e74bb753e733be2
This commit is contained in:
David Pursehouse
2019-07-05 16:49:46 +09:00
parent c163ad7bd0 58b2c5487e
commit bd049d9dc5
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/mail/send/CommentSender.java
View File

@@ -535,7 +535,8 @@ public class CommentSender extends ReplyToChangeSender {
} catch (IndexOutOfBoundsException err) {
// Default to the empty string if the given line number does not appear
// in the file.
logger.atFine().withCause(err).log("Failed to get line number of file on side %d", side);
logger.atFine().withCause(err).log(
"Failed to get line number %d of file on side %d", lineNbr, side);
return "";
} catch (NoSuchEntityException err) {
// Default to the empty string if the side cannot be found.