opendev/gerrit
Code Issues Proposed changes

Avoid implicit use of the platform default charset

Browse Source 
Change-Id: Ib4e8e1681ce5c075514b5348b6a865aa6711263a
This commit is contained in:
David Ostrovsky
2017-02-18 13:30:18 +01:00
committed by David Pursehouse
parent 02bed30b38
commit abe599cb7e
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BuildSystem.java
View File

@@ -76,7 +76,7 @@ public abstract class BuildSystem {
throw new InterruptedIOException("interrupted waiting for " + proc.toString()); throw new InterruptedIOException("interrupted waiting for " + proc.toString());
} }
if (status != 0) { if (status != 0) {
log.warn("build failed: " + new String(out)); log.warn("build failed: " + new String(out, UTF_8));
throw new BuildFailureException(out); throw new BuildFailureException(out);
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java
View File

@@ -96,7 +96,7 @@ public class ChangeResource implements RestResource, HasETag {
if (user.isIdentifiedUser()) { if (user.isIdentifiedUser()) {
for (AccountGroup.UUID uuid : user.getEffectiveGroups().getKnownGroups()) { for (AccountGroup.UUID uuid : user.getEffectiveGroups().getKnownGroups()) {
h.putBytes(uuid.get().getBytes()); h.putBytes(uuid.get().getBytes(UTF_8));
} }
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.server.patch; package com.google.gerrit.server.patch;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.common.data.CommentDetail; import com.google.gerrit.common.data.CommentDetail;
import com.google.gerrit.common.data.PatchScript; import com.google.gerrit.common.data.PatchScript;
import com.google.gerrit.common.data.PatchScript.DisplayMethod; import com.google.gerrit.common.data.PatchScript.DisplayMethod;
@@ -501,7 +503,7 @@ class PatchScriptBuilder {
} else if (mode.getObjectType() == Constants.OBJ_COMMIT) { } else if (mode.getObjectType() == Constants.OBJ_COMMIT) {
String strContent = "Subproject commit " + ObjectId.toString(id); String strContent = "Subproject commit " + ObjectId.toString(id);
srcContent = strContent.getBytes(); srcContent = strContent.getBytes(UTF_8);
} else { } else {
srcContent = Text.NO_BYTES; srcContent = Text.NO_BYTES;

3
gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.plugins; package com.google.gerrit.server.plugins;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.gerrit.extensions.annotations.Export; import com.google.gerrit.extensions.annotations.Export;
@@ -80,7 +81,7 @@ public abstract class AbstractPreloadedPluginScanner implements PluginContentSca
appendIfNotNull(manifestString, "Gerrit-SshModule: ", sshModuleClass); appendIfNotNull(manifestString, "Gerrit-SshModule: ", sshModuleClass);
appendIfNotNull(manifestString, "Gerrit-HttpModule: ", httpModuleClass); appendIfNotNull(manifestString, "Gerrit-HttpModule: ", httpModuleClass);
appendIfNotNull(manifestString, "Gerrit-Module: ", sysModuleClass); appendIfNotNull(manifestString, "Gerrit-Module: ", sysModuleClass);
return new Manifest(new ByteArrayInputStream(manifestString.toString().getBytes())); return new Manifest(new ByteArrayInputStream(manifestString.toString().getBytes(UTF_8)));
} }
@Override @Override

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java
View File

@@ -137,7 +137,7 @@ final class ScpCommand extends BaseCommand {
try { try {
out.write(2); out.write(2);
out.write(e.getMessage().getBytes()); out.write(e.getMessage().getBytes(UTF_8));
out.write('\n'); out.write('\n');
out.flush(); out.flush();
} catch (IOException e2) { } catch (IOException e2) {

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
View File

@@ -230,7 +230,7 @@ final class SetAccountCommand extends SshCommand {
throws RestApiException, OrmException, IOException, ConfigInvalidException { throws RestApiException, OrmException, IOException, ConfigInvalidException {
for (final String sshKey : sshKeys) { for (final String sshKey : sshKeys) {
AddSshKey.Input in = new AddSshKey.Input(); AddSshKey.Input in = new AddSshKey.Input();
in.raw = RawInputUtil.create(sshKey.getBytes(), "plain/text"); in.raw = RawInputUtil.create(sshKey.getBytes(UTF_8), "plain/text");
addSshKey.apply(rsrc, in); addSshKey.apply(rsrc, in);
} }
} }