opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Revert partially "Trim multi-line arguments for task name and ssh_log"

Change-Id: Id05ac521217c7fb6249cdbe7a429585dfdacd18c
This commit is contained in:
David Pursehouse 2018-03-06 09:59:52 +09:00
commit 8dec0d653a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java
View File

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