Remove extra / for template install path during sync. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0acce2c5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0acce2c5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0acce2c5
Branch: refs/heads/object_store Commit: 0acce2c518cfca911d1ebcda80a62396b3cbec8f Parents: bb85a56 Author: Min Chen <[email protected]> Authored: Fri Jun 14 15:14:41 2013 -0700 Committer: Min Chen <[email protected]> Committed: Fri Jun 14 15:14:41 2013 -0700 ---------------------------------------------------------------------- core/src/com/cloud/storage/template/TemplateLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0acce2c5/core/src/com/cloud/storage/template/TemplateLocation.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/storage/template/TemplateLocation.java b/core/src/com/cloud/storage/template/TemplateLocation.java index 34626e5..161a663 100644 --- a/core/src/com/cloud/storage/template/TemplateLocation.java +++ b/core/src/com/cloud/storage/template/TemplateLocation.java @@ -159,7 +159,7 @@ public class TemplateLocation { public TemplateProp getTemplateInfo() { TemplateProp tmplInfo = new TemplateProp(); tmplInfo.id = Long.parseLong(_props.getProperty("id")); - tmplInfo.installPath = _templatePath + File.separator + _props.getProperty("filename"); + tmplInfo.installPath = _templatePath + _props.getProperty("filename"); // _templatePath endsWith / if (_resourceType == ResourceType.VOLUME){ tmplInfo.installPath = tmplInfo.installPath.substring(tmplInfo.installPath.indexOf("volumes")); }else {
