From 9b40f3d379203f5beea87b717bf0a8a752ff5b9b Mon Sep 17 00:00:00 2001
From: Sander Botman <sbotman@schubergphilis.com>
Date: Tue, 12 Aug 2014 18:54:42 +0200
Subject: [PATCH] fixing the nullpointer on type which is null

---
 .../agent/resource/virtualnetwork/ConfigHelper.java   | 10 +++++-----
 .../resource/virtualnetwork/model/FirewallRule.java   | 11 +----------
 .../resource/virtualnetwork/model/FirewallRules.java  |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
index ba7dca39643..7644fcf99ec 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
@@ -23,10 +23,6 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 import com.cloud.agent.api.BumpUpPriorityCommand;
 import com.cloud.agent.api.SetupGuestNetworkCommand;
 import com.cloud.agent.api.routing.CreateIpAliasCommand;
@@ -92,6 +88,10 @@ import com.cloud.network.LoadBalancerConfigurator;
 import com.cloud.network.vpc.StaticRouteProfile;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 
 public class ConfigHelper {
     private final static Gson gson;
@@ -174,7 +174,7 @@ public class ConfigHelper {
         for (FirewallRuleTO rule : cmd.getRules()) {
             FirewallRule fwRule = new FirewallRule(rule.getId(), rule.getSrcVlanTag(), rule.getSrcIp(), rule.getProtocol(), rule.getSrcPortRange(), rule.revoked(),
                     rule.isAlreadyAdded(), rule.getSourceCidrList(), rule.getPurpose().toString(), rule.getIcmpType(), rule.getIcmpCode(), rule.getTrafficType().toString(),
-                    rule.getGuestCidr(), rule.isDefaultEgressPolicy(), rule.getType().toString());
+                    rule.getGuestCidr(), rule.isDefaultEgressPolicy());
             rules.add(fwRule);
         }
 
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java
index f03d40ca090..0543094795c 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRule.java
@@ -43,7 +43,7 @@ public class FirewallRule {
     }
 
     public FirewallRule(long id, String srcVlanTag, String srcIp, String protocol, int[] srcPortRange, boolean revoked, boolean alreadyAdded, List<String> sourceCidrList,
-            String purpose, Integer icmpType, Integer icmpCode, String trafficType, String guestCidr, boolean defaultEgressPolicy, String type) {
+            String purpose, Integer icmpType, Integer icmpCode, String trafficType, String guestCidr, boolean defaultEgressPolicy) {
         this.id = id;
         this.srcVlanTag = srcVlanTag;
         this.srcIp = srcIp;
@@ -58,7 +58,6 @@ public class FirewallRule {
         this.trafficType = trafficType;
         this.guestCidr = guestCidr;
         this.defaultEgressPolicy = defaultEgressPolicy;
-        this.type = type;
     }
 
     public long getId() {
@@ -173,12 +172,4 @@ public class FirewallRule {
         this.defaultEgressPolicy = defaultEgressPolicy;
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
 }
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java
index d74b40b43bd..4a0d814131b 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/model/FirewallRules.java
@@ -39,4 +39,4 @@ public class FirewallRules extends ConfigBase {
         this.rules = rules;
     }
 
-}
+}
\ No newline at end of file