opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  ReviewersUtil: Fix candidate list multiplier comment
  Replace FileInputStream and FileOutputStream with static Files methods

Change-Id: I5c4e04457b680db7709c522f17cfef1bef91a60f
This commit is contained in:
David Pursehouse
2017-05-10 15:47:21 +09:00
parent 7cd6a74556 7da5826b7b
commit 9cbfae0ada
12 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java
View File

@@ -25,12 +25,11 @@ import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
import com.google.inject.Inject;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Files;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
@@ -54,6 +53,7 @@ final class PluginInstallCommand extends SshCommand {
@Inject private PluginLoader loader;
@SuppressWarnings("resource")
@Override
protected void run() throws UnloggedFailure {
if (!loader.isRemoteAdminEnabled()) {
@@ -80,8 +80,8 @@ final class PluginInstallCommand extends SshCommand {
data = in;
} else if (new File(source).isFile() && source.equals(new File(source).getAbsolutePath())) {
try {
data = new FileInputStream(new File(source));
} catch (FileNotFoundException e) {
data = Files.newInputStream(new File(source).toPath());
} catch (IOException e) {
throw die("cannot read " + source);
}
} else {