apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use java.io.tmpdir instead of hardcoded /tmp

Browse Source 
This was submitted earlier in PR #884 but that did not merge
properly.

This is a new PR with the same change.
This commit is contained in:
Wido den Hollander 2015-10-30 14:19:38 +01:00
parent 901d47c07e
commit ea92fc15ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/template/LocalTemplateDownloader.java
View File

@ -38,7 +38,7 @@ public class LocalTemplateDownloader extends TemplateDownloaderBase implements T
public LocalTemplateDownloader(StorageLayer storageLayer, String downloadUrl, String toDir, long maxTemplateSizeInBytes, DownloadCompleteCallback callback) {
super(storageLayer, downloadUrl, toDir, maxTemplateSizeInBytes, callback);
String filename = downloadUrl.substring(downloadUrl.lastIndexOf(File.separator));
String filename = new File(downloadUrl).getName();
_toFile = toDir.endsWith(File.separator) ? (toDir + filename) : (toDir + File.separator + filename);
}

6
core/test/com/cloud/storage/template/LocalTemplateDownloaderTest.java
View File

@ -29,9 +29,9 @@ import org.junit.Test;
public class LocalTemplateDownloaderTest {
@Test
public void localTemplateDownloaderTest() {
String url = "file://" + new File("pom.xml").getAbsolutePath();
TemplateDownloader td = new LocalTemplateDownloader(null, url, "/tmp", TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES, null);
public void localTemplateDownloaderTest() throws Exception {
String url = new File("pom.xml").toURI().toURL().toString();
TemplateDownloader td = new LocalTemplateDownloader(null, url, System.getProperty("java.io.tmpdir"), TemplateDownloader.DEFAULT_MAX_TEMPLATE_SIZE_IN_BYTES, null);
long bytes = td.download(true, null);
if (!(bytes > 0)) {
fail("Failed download");