Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD776E1FB for ; Thu, 7 Feb 2013 20:04:18 +0000 (UTC) Received: (qmail 69893 invoked by uid 500); 7 Feb 2013 20:04:13 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 69812 invoked by uid 500); 7 Feb 2013 20:04:13 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 69259 invoked by uid 99); 7 Feb 2013 20:04:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 20:04:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 942E924E17; Thu, 7 Feb 2013 20:04:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [25/51] [abbrv] git commit: refs/heads/ui-plugins - Summary: Fix NPE when calling createFirewallRule Message-Id: <20130207200412.942E924E17@tyr.zones.apache.org> Date: Thu, 7 Feb 2013 20:04:12 +0000 (UTC) Summary: Fix NPE when calling createFirewallRule Detail: CreateFirewallRuleCmd.java was returning 'null' for getTrafficType(). Recently, getTrafficType started being used by createIngressFirewallRule. Changing getTrafficType() to return ingress per Jayapal Reddy. BUG-ID: CLOUDSTACK-1168 Bugfix-for: master,4.1 Signed-off-by: Marcus Sorensen 1360170916 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ec6fdc74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ec6fdc74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ec6fdc74 Branch: refs/heads/ui-plugins Commit: ec6fdc7471a327a30c16426012a6132fab4e40a2 Parents: dc7578c Author: Marcus Sorensen Authored: Wed Feb 6 10:15:16 2013 -0700 Committer: Marcus Sorensen Committed: Wed Feb 6 10:15:16 2013 -0700 ---------------------------------------------------------------------- .../user/firewall/CreateFirewallRuleCmd.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ec6fdc74/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index d0c49ff..b7cb471 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -324,7 +324,7 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal @Override public TrafficType getTrafficType() { - return null; + return FirewallRule.TrafficType.Ingress; } }