Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Date: Thu, 14 Sep 2017 12:24:14 +0000
To: "commits@cloudstack.apache.org" <commits@cloudstack.apache.org>
Subject: [cloudstack] branch master updated: CLOUDSTACK-10019:
 template.properties has hardcoded id (#2243)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <150539185478.12498.7336560101652533405@gitbox.apache.org>
From: bhaisaab@apache.org
Reply-To: "commits@cloudstack.apache.org" <commits@cloudstack.apache.org>
Auto-Submitted: auto-generated
archived-at: Thu, 14 Sep 2017 12:24:20 -0000

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new c7a55eb  CLOUDSTACK-10019: template.properties has hardcoded id (#2243)
c7a55eb is described below

commit c7a55eb812b6b85e0e9715b95f3049c143ca0d39
Author: mrunalinikankariya <mrunalini_kankariya@persistent.com>
AuthorDate: Thu Sep 14 17:54:12 2017 +0530

    CLOUDSTACK-10019: template.properties has hardcoded id (#2243)
    
    The template.properties file created after creating template from snapshot has hardcoded id = 1.
    The id should have template ID.
---
 .../cloudstack/storage/resource/NfsSecondaryStorageResource.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 4980d97..68569ea 100644
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -463,7 +463,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
             FormatInfo info = processor.process(destPath, null, templateUuid);
 
             TemplateLocation loc = new TemplateLocation(_storage, destPath);
-            loc.create(1, true, templateUuid);
+            loc.create(destData.getId(), true, templateUuid);
             loc.addFormat(info);
             loc.save();
             TemplateProp prop = loc.getTemplateInfo();
@@ -553,7 +553,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
 
                     FormatInfo info = processor.process(destPath, null, templateName);
                     TemplateLocation loc = new TemplateLocation(_storage, destPath);
-                    loc.create(1, true, destData.getName());
+                    loc.create(destData.getId(), true, destData.getName());
                     loc.addFormat(info);
                     loc.save();
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].