etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8656: handle template properties loading

This commit is contained in:
Daan Hoogland 2015-08-02 12:48:34 +02:00
parent 2ae2aac9f5
commit 65dc1d5dba
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/com/cloud/storage/template/TemplateLocation.java
View File

@ -94,17 +94,10 @@ public class TemplateLocation {
}
public boolean load() throws IOException {
FileInputStream strm = null;
try {
strm = new FileInputStream(_file);
try (FileInputStream strm = new FileInputStream(_file);) {
_props.load(strm);
} finally {
if (strm != null) {
try {
strm.close();
} catch (IOException e) {
}
}
} catch (IOException e) {
s_logger.warn("Unable to load the template properties", e);
}
for (ImageFormat format : ImageFormat.values()) {
@ -142,20 +135,11 @@ public class TemplateLocation {
_props.setProperty(info.format.getFileExtension() + ".size", Long.toString(info.size));
_props.setProperty(info.format.getFileExtension() + ".virtualsize", Long.toString(info.virtualSize));
}
FileOutputStream strm = null;
try {
strm = new FileOutputStream(_file);
try (FileOutputStream strm = new FileOutputStream(_file);) {
_props.store(strm, "");
} catch (IOException e) {
s_logger.warn("Unable to save the template properties ", e);
return false;
} finally {
if (strm != null) {
try {
strm.close();
} catch (IOException e) {
}
}
}
return true;
}