From ec6fdc7471a327a30c16426012a6132fab4e40a2 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 6 Feb 2013 10:15:16 -0700 Subject: [PATCH] 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 --- .../api/command/user/firewall/CreateFirewallRuleCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d0c49ff8736..b7cb4712047 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; } }