opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Extract an enum for label functions
  LabelNormalizer: Remove unused fields and exceptions
  MoveChange: only keep veto votes
  SubmitRules: discontinue permission checks
  LabelNormalizer: stop squashing based on permitted range
  Trim multi-line arguments for task name and ssh_log
  PostReview: Remove support for 'strictLabels' option
  Revert "SSH commands: Set task name for ReviewCommand"
  Improve naming of group caches
  Cache groups by member outside of the account cache
  Remove the dependency of the account cache on the group index

Change-Id: I2fb446d4b2137b5f1a78748dec3cfb96a1063c68
This commit is contained in:
Paladox
2018-02-21 16:51:10 +00:00
committed by Paladox none
parent 0f94a49cc1 ff03f0b455
commit d173fcfc78
5 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/sshd/SshLog.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.sshd;
import com.google.common.base.Joiner;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.common.TimeUtil;
@@ -282,9 +283,9 @@ class SshLog implements LifecycleListener {
return "Command was already destroyed";
}
StringBuilder commandName = new StringBuilder(dcmd.getCommandName());
String[] args = dcmd.getArguments();
for (int i = 1; i < args.length; i++) {
commandName.append(".").append(args[i]);
String[] trimmedArgs = dcmd.getTrimmedArguments();
if (trimmedArgs != null) {
commandName.append(Joiner.on(".").join(trimmedArgs));
}
return commandName.toString();
}