Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C92641180D for ; Wed, 24 Sep 2014 07:07:42 +0000 (UTC) Received: (qmail 66292 invoked by uid 500); 24 Sep 2014 07:07:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 66239 invoked by uid 500); 24 Sep 2014 07:07:42 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 66226 invoked by uid 99); 24 Sep 2014 07:07:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Sep 2014 07:07:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 671EE8389E1; Wed, 24 Sep 2014 07:07:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: commits@cloudstack.apache.org Date: Wed, 24 Sep 2014 07:07:42 -0000 Message-Id: <01d9c96a068040c6824c278350bbd8cb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: updated refs/heads/master to 3a5401f Repository: cloudstack Updated Branches: refs/heads/master 2503aaafe -> 3a5401f8f CID-1240106 Remove unused variable Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ead2046 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ead2046 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ead2046 Branch: refs/heads/master Commit: 9ead2046d495db6af496656c1f69ae1dc1a1d1a2 Parents: 49de3ab Author: Hugo Trippaers Authored: Tue Sep 23 11:02:40 2014 +0200 Committer: Hugo Trippaers Committed: Tue Sep 23 11:02:40 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/template/TemplateManagerImpl.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ead2046/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 247ed00..a1ca344 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -629,13 +629,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, // Event details String copyEventType; - String createEventType; if (template.getFormat().equals(ImageFormat.ISO)) { copyEventType = EventTypes.EVENT_ISO_COPY; - createEventType = EventTypes.EVENT_ISO_CREATE; } else { copyEventType = EventTypes.EVENT_TEMPLATE_COPY; - createEventType = EventTypes.EVENT_TEMPLATE_CREATE; } TemplateInfo srcTemplate = _tmplFactory.getTemplate(template.getId(), srcSecStore); @@ -1493,8 +1490,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, @Override @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_CREATE, eventDescription = "creating template", create = true) public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account templateOwner) throws ResourceAllocationException { - Long userId = CallContext.current().getCallingUserId(); - Account caller = CallContext.current().getCallingAccount(); boolean isAdmin = (_accountMgr.isAdmin(caller.getId()));