Dereference null return value

Author: Kshitij Kansal

server/src/com/cloud/api/ApiResponseHelper.java

@@ -505,7 +505,8 @@ public SnapshotResponse createSnapshotResponse(Snapshot snapshot) {
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         snapshotResponse.setTags(tagResponses);
 
@@ -790,7 +791,8 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         ipResponse.setTags(tagResponses);
 
@@ -832,7 +834,8 @@ public LoadBalancerResponse createLoadBalancerResponse(LoadBalancer loadBalancer
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         lbResponse.setTags(tagResponses);
 
@@ -1119,7 +1122,8 @@ public FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
 
@@ -2072,7 +2076,8 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
 
@@ -2158,7 +2163,8 @@ public FirewallResponse createFirewallResponse(FirewallRule fwRule) {
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
 
@@ -2209,7 +2215,8 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
 
@@ -2645,6 +2652,8 @@ public RegionResponse createRegionResponse(Region region) {
     @Override
     public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) {
         ResourceTagJoinVO rto = ApiDBUtils.newResourceTagView(resourceTag);
+        if(rto == null)
+            return null;
         return ApiDBUtils.newResourceTagResponse(rto, keyValueOnly);
     }
 
@@ -2753,7 +2762,8 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
         response.setObjectName("vpc");
@@ -2944,7 +2954,8 @@ public StaticRouteResponse createStaticRouteResponse(StaticRoute result) {
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         response.setTags(tagResponses);
         response.setObjectName("staticroute");
@@ -3512,7 +3523,8 @@ public ApplicationLoadBalancerResponse createLoadBalancerContainerReponse(Applic
         List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
         for (ResourceTag tag : tags) {
             ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
-            tagResponses.add(tagResponse);
+            if(tagResponse != null)
+                tagResponses.add(tagResponse);
         }
         lbResponse.setTags(tagResponses);