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 DC14B10F81 for ; Fri, 31 Jan 2014 18:18:57 +0000 (UTC) Received: (qmail 6543 invoked by uid 500); 31 Jan 2014 18:18:54 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 6465 invoked by uid 500); 31 Jan 2014 18:18:52 -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 6093 invoked by uid 99); 31 Jan 2014 18:18:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 18:18:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C9038C0020; Fri, 31 Jan 2014 18:18:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Fri, 31 Jan 2014 18:18:55 -0000 Message-Id: <347d1e14fc894a2296bf4977c9f80adc@git.apache.org> In-Reply-To: <4d2c963f42854071906bd35d54dbf99a@git.apache.org> References: <4d2c963f42854071906bd35d54dbf99a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: updated refs/heads/4.3 to 8c45ab0 findbugs Long comparison == -> equals() (cherry picked from commit f4db8df66fbcb5df3cd9bbf607ede9a4d514fe4a) Signed-off-by: Daan Hoogland Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c45ab07 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c45ab07 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c45ab07 Branch: refs/heads/4.3 Commit: 8c45ab0761c533a26467fc89c9ca6d2424a720fb Parents: 6aa3fd8 Author: Daan Hoogland Authored: Fri Jan 31 09:07:55 2014 +0100 Committer: Daan Hoogland Committed: Fri Jan 31 19:17:58 2014 +0100 ---------------------------------------------------------------------- server/src/com/cloud/template/TemplateManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c45ab07/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 681be4a..3bfe5c8 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1801,7 +1801,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } // Don't allow to modify system template - if (id == Long.valueOf(1)) { + if (Long.valueOf(1).equals(id)) { InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id"); ex.addProxyObject(String.valueOf(id), "templateId"); throw ex;