Skip to content

Commit c804660

Browse files
amoghvamoghv
committed
CLOUDSTACK-7168: Revert "Fixed Coverity Issues reported" that broke CI
This reverts commit 4523490.
1 parent bb1c70b commit c804660

File tree

11 files changed

+193
-172
lines changed

11 files changed

+193
-172
lines changed

‎api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ public Map<String, String> getDetails() {
225225
Iterator iter = parameterCollection.iterator();
226226
while (iter.hasNext()) {
227227
HashMap<String, String> value = (HashMap<String, String>)iter.next();
228-
for (Map.Entry<String,String> entry: value.entrySet()) {
229-
customparameterMap.put(entry.getKey(),entry.getValue());
228+
for (String key : value.keySet()) {
229+
customparameterMap.put(key, value.get(key));
230230
}
231231
}
232232
}

‎engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.sql.PreparedStatement;
2020
import java.sql.ResultSet;
21+
import java.sql.SQLException;
2122
import java.util.ArrayList;
2223
import java.util.Date;
2324
import java.util.List;
@@ -169,49 +170,71 @@ public List<VMTemplateStoragePoolVO> listByTemplateStatus(long templateId, long
169170
@Override
170171
public List<VMTemplateStoragePoolVO> listByTemplateStatus(long templateId, long datacenterId, long podId, VMTemplateStoragePoolVO.Status downloadState) {
171172
TransactionLegacy txn = TransactionLegacy.currentTxn();
173+
PreparedStatement pstmt = null;
172174
List<VMTemplateStoragePoolVO> result = new ArrayList<VMTemplateStoragePoolVO>();
173-
String sql = DOWNLOADS_STATE_DC_POD;
174-
try(PreparedStatement pstmt = txn.prepareStatement(sql);) {
175+
ResultSet rs = null;
176+
try {
177+
String sql = DOWNLOADS_STATE_DC_POD;
178+
pstmt = txn.prepareStatement(sql);
179+
175180
pstmt.setLong(1, datacenterId);
176181
pstmt.setLong(2, podId);
177182
pstmt.setLong(3, templateId);
178183
pstmt.setString(4, downloadState.toString());
179-
try(ResultSet rs = pstmt.executeQuery();) {
180-
while (rs.next()) {
181-
// result.add(toEntityBean(rs, false)); TODO: this is buggy in
182-
// GenericDaoBase for hand constructed queries
183-
long id = rs.getLong(1); // ID column
184-
result.add(findById(id));
185-
}
186-
}catch (Exception e) {
187-
s_logger.warn("Exception: ", e);
184+
rs = pstmt.executeQuery();
185+
while (rs.next()) {
186+
// result.add(toEntityBean(rs, false)); TODO: this is buggy in
187+
// GenericDaoBase for hand constructed queries
188+
long id = rs.getLong(1); // ID column
189+
result.add(findById(id));
188190
}
189191
} catch (Exception e) {
190192
s_logger.warn("Exception: ", e);
193+
} finally {
194+
try {
195+
if (rs != null) {
196+
rs.close();
197+
}
198+
if (pstmt != null) {
199+
pstmt.close();
200+
}
201+
} catch (SQLException e) {
202+
}
191203
}
192204
return result;
193205

194206
}
195207

196208
public List<VMTemplateStoragePoolVO> listByHostTemplate(long hostId, long templateId) {
197209
TransactionLegacy txn = TransactionLegacy.currentTxn();
210+
PreparedStatement pstmt = null;
198211
List<VMTemplateStoragePoolVO> result = new ArrayList<VMTemplateStoragePoolVO>();
199-
String sql = HOST_TEMPLATE_SEARCH;
200-
try(PreparedStatement pstmt = txn.prepareStatement(sql);) {
212+
ResultSet rs = null;
213+
try {
214+
String sql = HOST_TEMPLATE_SEARCH;
215+
pstmt = txn.prepareStatement(sql);
216+
201217
pstmt.setLong(1, hostId);
202218
pstmt.setLong(2, templateId);
203-
try(ResultSet rs = pstmt.executeQuery();) {
204-
while (rs.next()) {
205-
// result.add(toEntityBean(rs, false)); TODO: this is buggy in
206-
// GenericDaoBase for hand constructed queries
207-
long id = rs.getLong(1); // ID column
208-
result.add(findById(id));
209-
}
210-
}catch (Exception e) {
211-
s_logger.warn("Exception: ", e);
219+
rs = pstmt.executeQuery();
220+
while (rs.next()) {
221+
// result.add(toEntityBean(rs, false)); TODO: this is buggy in
222+
// GenericDaoBase for hand constructed queries
223+
long id = rs.getLong(1); // ID column
224+
result.add(findById(id));
212225
}
213226
} catch (Exception e) {
214227
s_logger.warn("Exception: ", e);
228+
} finally {
229+
try {
230+
if (rs != null) {
231+
rs.close();
232+
}
233+
if (pstmt != null) {
234+
pstmt.close();
235+
}
236+
} catch (SQLException e) {
237+
}
215238
}
216239
return result;
217240

‎engine/schema/src/com/cloud/upgrade/dao/Upgrade440to450.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.ArrayList;
2323
import java.util.HashMap;
2424
import java.util.List;
25-
import java.util.Map;
2625

2726
import org.apache.log4j.Logger;
2827

@@ -81,8 +80,8 @@ private void dropInvalidKeyFromStoragePoolTable(Connection conn) {
8180
uniqueKeys.put("storage_pool", keys);
8281

8382
s_logger.debug("Droping id_2 key from storage_pool table");
84-
for (Map.Entry<String, List<String>> entry: uniqueKeys.entrySet()) {
85-
DbUpgradeUtils.dropKeysIfExist(conn,entry.getKey(), entry.getValue(), false);
83+
for (String tableName : uniqueKeys.keySet()) {
84+
DbUpgradeUtils.dropKeysIfExist(conn, tableName, uniqueKeys.get(tableName), false);
8685
}
8786
}
8887
}

‎engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,33 @@ protected EndPoint findEndPointInScope(Scope scope, String sqlBase, Long poolId)
115115
// TODO: order by rand() is slow if there are lot of hosts
116116
sbuilder.append(" ORDER by rand() limit 1");
117117
String sql = sbuilder.toString();
118+
PreparedStatement pstmt = null;
119+
ResultSet rs = null;
118120
HostVO host = null;
119121
TransactionLegacy txn = TransactionLegacy.currentTxn();
120-
try(PreparedStatement pstmt = txn.prepareStatement(sql);) {
122+
123+
try {
124+
pstmt = txn.prepareStatement(sql);
121125
pstmt.setLong(1, poolId);
122-
try(ResultSet rs = pstmt.executeQuery();) {
123-
while (rs.next()) {
124-
long id = rs.getLong(1);
125-
host = hostDao.findById(id);
126-
}
127-
}catch (SQLException e) {
128-
s_logger.warn("can't find endpoint", e);
126+
rs = pstmt.executeQuery();
127+
while (rs.next()) {
128+
long id = rs.getLong(1);
129+
host = hostDao.findById(id);
129130
}
130131
} catch (SQLException e) {
131132
s_logger.warn("can't find endpoint", e);
133+
} finally {
134+
try {
135+
if (rs != null) {
136+
rs.close();
137+
}
138+
if (pstmt != null) {
139+
pstmt.close();
140+
}
141+
} catch (SQLException e) {
142+
}
132143
}
144+
133145
if (host == null) {
134146
return null;
135147
}

‎engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,9 +1464,8 @@ public void handleVolumeSync(DataStore store) {
14641464
}
14651465

14661466
// Delete volumes which are not present on DB.
1467-
for (Map.Entry<Long,TemplateProp> entry : volumeInfos.entrySet()) {
1468-
Long uniqueName = entry.getKey();
1469-
TemplateProp tInfo = entry.getValue();
1467+
for (Long uniqueName : volumeInfos.keySet()) {
1468+
TemplateProp tInfo = volumeInfos.get(uniqueName);
14701469

14711470
//we cannot directly call expungeVolumeAsync here to
14721471
// reuse delete logic since in this case, our db does not have

‎plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,16 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
104104
String trafficLabel = nic.getName();
105105
if (nic.getType() == Networks.TrafficType.Guest) {
106106
Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0;
107-
if ((nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan) && (vNetId != null) && (protocol != null) && (!vNetId.equalsIgnoreCase("untagged")) ||
108-
(nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan)) {
109-
if (trafficLabel != null && !trafficLabel.isEmpty()) {
110-
s_logger.debug("creating a vNet dev and bridge for guest traffic per traffic label " + trafficLabel);
111-
String brName = createVnetBr(vNetId, trafficLabel, protocol);
112-
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
113-
} else {
114-
String brName = createVnetBr(vNetId, "private", protocol);
115-
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
116-
}
107+
if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vNetId.equalsIgnoreCase("untagged") ||
108+
nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan) {
109+
if (trafficLabel != null && !trafficLabel.isEmpty()) {
110+
s_logger.debug("creating a vNet dev and bridge for guest traffic per traffic label " + trafficLabel);
111+
String brName = createVnetBr(vNetId, trafficLabel, protocol);
112+
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
113+
} else {
114+
String brName = createVnetBr(vNetId, "private", protocol);
115+
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
116+
}
117117
} else {
118118
intf.defBridgeNet(_bridges.get("guest"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
119119
}
@@ -123,8 +123,8 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
123123
intf.defBridgeNet(_bridges.get("linklocal"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
124124
} else if (nic.getType() == Networks.TrafficType.Public) {
125125
Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0;
126-
if ((nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan) && (vNetId != null) && (protocol != null) && (!vNetId.equalsIgnoreCase("untagged")) ||
127-
(nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan)) {
126+
if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vNetId.equalsIgnoreCase("untagged") ||
127+
nic.getBroadcastType() == Networks.BroadcastDomainType.Vxlan) {
128128
if (trafficLabel != null && !trafficLabel.isEmpty()) {
129129
s_logger.debug("creating a vNet dev and bridge for public traffic per traffic label " + trafficLabel);
130130
String brName = createVnetBr(vNetId, trafficLabel, protocol);

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

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,24 +1026,20 @@ public FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule
10261026

10271027

10281028
IpAddress ip = ApiDBUtils.findIpAddressById(fwRule.getSourceIpAddressId());
1029+
response.setPublicIpAddressId(ip.getUuid());
1030+
response.setPublicIpAddress(ip.getAddress().addr());
10291031

1030-
if (ip != null)
1031-
{
1032-
response.setPublicIpAddressId(ip.getUuid());
1033-
response.setPublicIpAddress(ip.getAddress().addr());
1034-
if (fwRule.getDestinationIpAddress() != null)
1035-
{
1036-
response.setDestNatVmIp(fwRule.getDestinationIpAddress().toString());
1037-
UserVm vm = ApiDBUtils.findUserVmById(fwRule.getVirtualMachineId());
1038-
if (vm != null) {
1039-
response.setVirtualMachineId(vm.getUuid());
1040-
response.setVirtualMachineName(vm.getHostName());
1032+
if (ip != null && fwRule.getDestinationIpAddress() != null) {
1033+
response.setDestNatVmIp(fwRule.getDestinationIpAddress().toString());
1034+
UserVm vm = ApiDBUtils.findUserVmById(fwRule.getVirtualMachineId());
1035+
if (vm != null) {
1036+
response.setVirtualMachineId(vm.getUuid());
1037+
response.setVirtualMachineName(vm.getHostName());
10411038

1042-
if (vm.getDisplayName() != null) {
1043-
response.setVirtualMachineDisplayName(vm.getDisplayName());
1044-
} else {
1045-
response.setVirtualMachineDisplayName(vm.getHostName());
1046-
}
1039+
if (vm.getDisplayName() != null) {
1040+
response.setVirtualMachineDisplayName(vm.getDisplayName());
1041+
} else {
1042+
response.setVirtualMachineDisplayName(vm.getHostName());
10471043
}
10481044
}
10491045
}
@@ -1075,20 +1071,18 @@ public IpForwardingRuleResponse createIpForwardingRuleResponse(StaticNatRule fwR
10751071
response.setProtocol(fwRule.getProtocol());
10761072

10771073
IpAddress ip = ApiDBUtils.findIpAddressById(fwRule.getSourceIpAddressId());
1078-
1079-
if (ip != null) {
1080-
response.setPublicIpAddressId(ip.getId());
1081-
response.setPublicIpAddress(ip.getAddress().addr());
1082-
if (fwRule.getDestIpAddress() != null) {
1083-
UserVm vm = ApiDBUtils.findUserVmById(ip.getAssociatedWithVmId());
1084-
if (vm != null) {// vm might be destroyed
1085-
response.setVirtualMachineId(vm.getUuid());
1086-
response.setVirtualMachineName(vm.getHostName());
1087-
if (vm.getDisplayName() != null) {
1088-
response.setVirtualMachineDisplayName(vm.getDisplayName());
1089-
} else {
1090-
response.setVirtualMachineDisplayName(vm.getHostName());
1091-
}
1074+
response.setPublicIpAddressId(ip.getId());
1075+
response.setPublicIpAddress(ip.getAddress().addr());
1076+
1077+
if (ip != null && fwRule.getDestIpAddress() != null) {
1078+
UserVm vm = ApiDBUtils.findUserVmById(ip.getAssociatedWithVmId());
1079+
if (vm != null) {// vm might be destroyed
1080+
response.setVirtualMachineId(vm.getUuid());
1081+
response.setVirtualMachineName(vm.getHostName());
1082+
if (vm.getDisplayName() != null) {
1083+
response.setVirtualMachineDisplayName(vm.getDisplayName());
1084+
} else {
1085+
response.setVirtualMachineDisplayName(vm.getHostName());
10921086
}
10931087
}
10941088
}
@@ -1707,17 +1701,15 @@ public NetworkOfferingResponse createNetworkOfferingResponse(NetworkOffering off
17071701

17081702
Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listNetworkOfferingServices(offering.getId());
17091703
List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
1710-
for (Map.Entry<Service,Set<Provider>> entry : serviceProviderMap.entrySet()) {
1711-
Service service = entry.getKey();
1712-
Set<Provider> srvc_providers = entry.getValue();
1704+
for (Service service : serviceProviderMap.keySet()) {
17131705
ServiceResponse svcRsp = new ServiceResponse();
17141706
// skip gateway service
17151707
if (service == Service.Gateway) {
17161708
continue;
17171709
}
17181710
svcRsp.setName(service.getName());
17191711
List<ProviderResponse> providers = new ArrayList<ProviderResponse>();
1720-
for (Provider provider : srvc_providers) {
1712+
for (Provider provider : serviceProviderMap.get(service)) {
17211713
if (provider != null) {
17221714
ProviderResponse providerRsp = new ProviderResponse();
17231715
providerRsp.setName(provider.getName());
@@ -1964,9 +1956,8 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
19641956
Domain domain = ApiDBUtils.findDomainById(dedicatedDomainId);
19651957
if (domain != null) {
19661958
response.setDomainId(domain.getUuid());
1967-
response.setDomainName(domain.getName());
19681959
}
1969-
1960+
response.setDomainName(domain.getName());
19701961
}
19711962

19721963
response.setSpecifyIpRanges(network.getSpecifyIpRanges());
@@ -2572,18 +2563,15 @@ public VpcOfferingResponse createVpcOfferingResponse(VpcOffering offering) {
25722563

25732564
Map<Service, Set<Provider>> serviceProviderMap = ApiDBUtils.listVpcOffServices(offering.getId());
25742565
List<ServiceResponse> serviceResponses = new ArrayList<ServiceResponse>();
2575-
for (Map.Entry<Service, Set<Provider>> entry : serviceProviderMap.entrySet()) {
2576-
Service service = entry.getKey();
2577-
Set<Provider> srvc_providers = entry.getValue();
2578-
2566+
for (Service service : serviceProviderMap.keySet()) {
25792567
ServiceResponse svcRsp = new ServiceResponse();
25802568
// skip gateway service
25812569
if (service == Service.Gateway) {
25822570
continue;
25832571
}
25842572
svcRsp.setName(service.getName());
25852573
List<ProviderResponse> providers = new ArrayList<ProviderResponse>();
2586-
for (Provider provider : srvc_providers) {
2574+
for (Provider provider : serviceProviderMap.get(service)) {
25872575
if (provider != null) {
25882576
ProviderResponse providerRsp = new ProviderResponse();
25892577
providerRsp.setName(provider.getName());
@@ -3126,6 +3114,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord) {
31263114
} else if (usageRecord.getUsageType() == UsageTypes.TEMPLATE || usageRecord.getUsageType() == UsageTypes.ISO) {
31273115
//Template/ISO ID
31283116
VMTemplateVO tmpl = _entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, usageRecord.getUsageId().toString());
3117+
usageRecResponse.setUsageId(tmpl.getUuid());
31293118
if (tmpl != null) {
31303119
usageRecResponse.setUsageId(tmpl.getUuid());
31313120
}
@@ -3400,11 +3389,10 @@ public ApplicationLoadBalancerResponse createLoadBalancerContainerReponse(Applic
34003389

34013390
//set Lb instances information
34023391
List<ApplicationLoadBalancerInstanceResponse> instanceResponses = new ArrayList<ApplicationLoadBalancerInstanceResponse>();
3403-
for (Map.Entry<Ip,UserVm> entry : lbInstances.entrySet()) {
3404-
Ip ip = entry.getKey();
3405-
UserVm vm = entry.getValue();
3392+
for (Ip ip : lbInstances.keySet()) {
34063393
ApplicationLoadBalancerInstanceResponse instanceResponse = new ApplicationLoadBalancerInstanceResponse();
34073394
instanceResponse.setIpAddress(ip.addr());
3395+
UserVm vm = lbInstances.get(ip);
34083396
instanceResponse.setId(vm.getUuid());
34093397
instanceResponse.setName(vm.getInstanceName());
34103398
instanceResponse.setObjectName("loadbalancerinstance");

0 commit comments

Comments
 (0)