incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: refs/heads/4.1 - Summary: Fix NPE when calling createFirewallRule
Date Wed, 06 Feb 2013 17:20:23 GMT
Updated Branches:
  refs/heads/4.1 1ac95e15f -> 73bb1795c


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 <marcus@betterservers.com> 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/73bb1795
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/73bb1795
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/73bb1795

Branch: refs/heads/4.1
Commit: 73bb1795cbb99c719afb29d8f4e9fdb1b9f8abc1
Parents: 1ac95e1
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Wed Feb 6 10:15:16 2013 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Wed Feb 6 10:21:20 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/73bb1795/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;
     }
 
 }


Mime
View raw message