opendev/gerrit
Code Issues Proposed changes

SitePaths: Convert tmp_dir to Path

Browse Source 
Change-Id: I99571bae7580c3b024489ac10049fc6daf99c375
This commit is contained in:
Dave Borowitz
2015-02-23 15:08:33 -08:00
parent 8e481f3c33
commit 32218e3f34
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java
View File

@@ -31,6 +31,7 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -47,7 +48,8 @@ public class JarPluginProvider implements ServerPluginProvider {
@Inject
JarPluginProvider(SitePaths sitePaths) {
tmpDir = sitePaths.tmp_dir;
// TODO(dborowitz): Convert to NIO.
tmpDir = sitePaths.tmp_dir.toFile();
}
@Override
@@ -111,10 +113,11 @@ public class JarPluginProvider implements ServerPluginProvider {
public static File storeInTemp(String pluginName, InputStream in,
SitePaths sitePaths) throws IOException {
if (!sitePaths.tmp_dir.exists()) {
sitePaths.tmp_dir.mkdirs();
if (!Files.exists(sitePaths.tmp_dir)) {
Files.createDirectories(sitePaths.tmp_dir);
}
return asTemp(in, tempNameFor(pluginName), ".jar", sitePaths.tmp_dir);
return asTemp(in, tempNameFor(pluginName), ".jar",
sitePaths.tmp_dir.toFile());
}
private ServerPlugin loadJarPlugin(String name, File srcJar,