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 C8C1610145 for ; Wed, 10 Jul 2013 14:01:15 +0000 (UTC) Received: (qmail 92956 invoked by uid 500); 10 Jul 2013 14:01:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92875 invoked by uid 500); 10 Jul 2013 14:01:15 -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 92868 invoked by uid 99); 10 Jul 2013 14:01:14 -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, 10 Jul 2013 14:01:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 579D588BDD8; Wed, 10 Jul 2013 14:01:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Message-Id: <7f532e19520d4db390e91497cfef4fa3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 92884d1 Date: Wed, 10 Jul 2013 14:01:14 +0000 (UTC) Updated Branches: refs/heads/master 664dc17b0 -> 92884d1aa CLOUDSTACK-3442: [PortableIP] [VPC] Unable to associate Portable IP to VPC removing invalid check Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92884d1a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92884d1a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92884d1a Branch: refs/heads/master Commit: 92884d1aa02fd9287f47d95542331f92dfc8f88b Parents: 664dc17 Author: Murali Reddy Authored: Wed Jul 10 19:28:22 2013 +0530 Committer: Murali Reddy Committed: Wed Jul 10 19:30:56 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92884d1a/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 2f833d2..d4f9030 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -593,7 +593,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (vpcId != null) { Vpc vpc = _vpcDao.findById(vpcId); - if (vpc != null) { + if (vpc == null) { throw new InvalidParameterValueException("Invalid vpc id is given"); } }