|
30 | 30 |
|
31 | 31 | import javax.inject.Inject; |
32 | 32 |
|
| 33 | +import org.apache.commons.collections.CollectionUtils; |
33 | 34 | import org.apache.log4j.Logger; |
34 | 35 |
|
35 | 36 | import org.apache.cloudstack.acl.ControlledEntity; |
@@ -505,7 +506,7 @@ public SnapshotResponse createSnapshotResponse(Snapshot snapshot) { |
505 | 506 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
506 | 507 | for (ResourceTag tag : tags) { |
507 | 508 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
508 | | - tagResponses.add(tagResponse); |
| 509 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
509 | 510 | } |
510 | 511 | snapshotResponse.setTags(tagResponses); |
511 | 512 |
|
@@ -790,7 +791,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip |
790 | 791 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
791 | 792 | for (ResourceTag tag : tags) { |
792 | 793 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
793 | | - tagResponses.add(tagResponse); |
| 794 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
794 | 795 | } |
795 | 796 | ipResponse.setTags(tagResponses); |
796 | 797 |
|
@@ -832,7 +833,7 @@ public LoadBalancerResponse createLoadBalancerResponse(LoadBalancer loadBalancer |
832 | 833 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
833 | 834 | for (ResourceTag tag : tags) { |
834 | 835 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
835 | | - tagResponses.add(tagResponse); |
| 836 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
836 | 837 | } |
837 | 838 | lbResponse.setTags(tagResponses); |
838 | 839 |
|
@@ -1119,7 +1120,7 @@ public FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule |
1119 | 1120 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
1120 | 1121 | for (ResourceTag tag : tags) { |
1121 | 1122 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
1122 | | - tagResponses.add(tagResponse); |
| 1123 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
1123 | 1124 | } |
1124 | 1125 | response.setTags(tagResponses); |
1125 | 1126 |
|
@@ -2072,7 +2073,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network) |
2072 | 2073 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
2073 | 2074 | for (ResourceTag tag : tags) { |
2074 | 2075 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
2075 | | - tagResponses.add(tagResponse); |
| 2076 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
2076 | 2077 | } |
2077 | 2078 | response.setTags(tagResponses); |
2078 | 2079 |
|
@@ -2158,7 +2159,7 @@ public FirewallResponse createFirewallResponse(FirewallRule fwRule) { |
2158 | 2159 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
2159 | 2160 | for (ResourceTag tag : tags) { |
2160 | 2161 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
2161 | | - tagResponses.add(tagResponse); |
| 2162 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
2162 | 2163 | } |
2163 | 2164 | response.setTags(tagResponses); |
2164 | 2165 |
|
@@ -2209,7 +2210,7 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte |
2209 | 2210 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
2210 | 2211 | for (ResourceTag tag : tags) { |
2211 | 2212 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
2212 | | - tagResponses.add(tagResponse); |
| 2213 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
2213 | 2214 | } |
2214 | 2215 | response.setTags(tagResponses); |
2215 | 2216 |
|
@@ -2645,6 +2646,8 @@ public RegionResponse createRegionResponse(Region region) { |
2645 | 2646 | @Override |
2646 | 2647 | public ResourceTagResponse createResourceTagResponse(ResourceTag resourceTag, boolean keyValueOnly) { |
2647 | 2648 | ResourceTagJoinVO rto = ApiDBUtils.newResourceTagView(resourceTag); |
| 2649 | + if(rto == null) |
| 2650 | + return null; |
2648 | 2651 | return ApiDBUtils.newResourceTagResponse(rto, keyValueOnly); |
2649 | 2652 | } |
2650 | 2653 |
|
@@ -2753,7 +2756,7 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) { |
2753 | 2756 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
2754 | 2757 | for (ResourceTag tag : tags) { |
2755 | 2758 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
2756 | | - tagResponses.add(tagResponse); |
| 2759 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
2757 | 2760 | } |
2758 | 2761 | response.setTags(tagResponses); |
2759 | 2762 | response.setObjectName("vpc"); |
@@ -2944,7 +2947,7 @@ public StaticRouteResponse createStaticRouteResponse(StaticRoute result) { |
2944 | 2947 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
2945 | 2948 | for (ResourceTag tag : tags) { |
2946 | 2949 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
2947 | | - tagResponses.add(tagResponse); |
| 2950 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
2948 | 2951 | } |
2949 | 2952 | response.setTags(tagResponses); |
2950 | 2953 | response.setObjectName("staticroute"); |
@@ -3512,7 +3515,7 @@ public ApplicationLoadBalancerResponse createLoadBalancerContainerReponse(Applic |
3512 | 3515 | List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); |
3513 | 3516 | for (ResourceTag tag : tags) { |
3514 | 3517 | ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); |
3515 | | - tagResponses.add(tagResponse); |
| 3518 | + CollectionUtils.addIgnoreNull(tagResponses,tagResponse); |
3516 | 3519 | } |
3517 | 3520 | lbResponse.setTags(tagResponses); |
3518 | 3521 |
|
|
0 commit comments