Skip to content

Commit fe7df96

Browse files
kansalkansal
committed
Coverity Issue: NUll Pointer dereferncing fixed and commits squashed.
1 parent 61da853 commit fe7df96

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import javax.inject.Inject;
3232

33+
import org.apache.commons.collections.CollectionUtils;
3334
import org.apache.cloudstack.acl.ControlledEntity;
3435
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
3536
import org.apache.cloudstack.affinity.AffinityGroup;
@@ -504,7 +505,7 @@ public SnapshotResponse createSnapshotResponse(Snapshot snapshot) {
504505
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
505506
for (ResourceTag tag : tags) {
506507
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
507-
tagResponses.add(tagResponse);
508+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
508509
}
509510
snapshotResponse.setTags(tagResponses);
510511

@@ -789,7 +790,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
789790
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
790791
for (ResourceTag tag : tags) {
791792
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
792-
tagResponses.add(tagResponse);
793+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
793794
}
794795
ipResponse.setTags(tagResponses);
795796

@@ -831,7 +832,7 @@ public LoadBalancerResponse createLoadBalancerResponse(LoadBalancer loadBalancer
831832
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
832833
for (ResourceTag tag : tags) {
833834
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
834-
tagResponses.add(tagResponse);
835+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
835836
}
836837
lbResponse.setTags(tagResponses);
837838

@@ -1118,7 +1119,7 @@ public FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule
11181119
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
11191120
for (ResourceTag tag : tags) {
11201121
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
1121-
tagResponses.add(tagResponse);
1122+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
11221123
}
11231124
response.setTags(tagResponses);
11241125

@@ -2071,7 +2072,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
20712072
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
20722073
for (ResourceTag tag : tags) {
20732074
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
2074-
tagResponses.add(tagResponse);
2075+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
20752076
}
20762077
response.setTags(tagResponses);
20772078

@@ -2157,7 +2158,7 @@ public FirewallResponse createFirewallResponse(FirewallRule fwRule) {
21572158
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
21582159
for (ResourceTag tag : tags) {
21592160
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
2160-
tagResponses.add(tagResponse);
2161+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
21612162
}
21622163
response.setTags(tagResponses);
21632164

@@ -2208,7 +2209,7 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte
22082209
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
22092210
for (ResourceTag tag : tags) {
22102211
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
2211-
tagResponses.add(tagResponse);
2212+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
22122213
}
22132214
response.setTags(tagResponses);
22142215

@@ -2644,6 +2645,8 @@ public RegionResponse createRegionResponse(Region region) {
26442645
@Override
26452646
public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) {
26462647
ResourceTagJoinVO rto = ApiDBUtils.newResourceTagView(resourceTag);
2648+
if(rto == null)
2649+
return null;
26472650
return ApiDBUtils.newResourceTagResponse(rto, keyValueOnly);
26482651
}
26492652

@@ -2752,7 +2755,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
27522755
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
27532756
for (ResourceTag tag : tags) {
27542757
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
2755-
tagResponses.add(tagResponse);
2758+
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
27562759
}
27572760
response.setTags(tagResponses);
27582761
response.setObjectName("vpc");
@@ -2943,7 +2946,7 @@ public StaticRouteResponse createStaticRouteResponse(StaticRoute result) {
29432946
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
29442947
for (ResourceTag tag : tags) {
29452948
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
2946-
tagResponses.add(tagResponse);
2949+
CollectionUtils.addIgnoreNull(tagResponses,tagResponse);
29472950
}
29482951
response.setTags(tagResponses);
29492952
response.setObjectName("staticroute");
@@ -3511,7 +3514,7 @@ public ApplicationLoadBalancerResponse createLoadBalancerContainerReponse(Applic
35113514
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
35123515
for (ResourceTag tag : tags) {
35133516
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
3514-
tagResponses.add(tagResponse);
3517+
CollectionUtils.addIgnoreNull(tagResponses,tagResponse);
35153518
}
35163519
lbResponse.setTags(tagResponses);
35173520

0 commit comments

Comments
 (0)