Fixed Coverity reported type issues

sedukull · sedukull · commit dda2820552f9 · 2014-08-06T15:27:00.000+05:30
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
@@ -177,7 +177,7 @@ public Long getSourceIpAddressId() {
     @Override
     public Integer getSourcePortStart() {
         if (publicStartPort != null) {
-            return publicStartPort.intValue();
+            return publicStartPort;
         }
         return null;
     }
@@ -186,10 +186,10 @@ public Integer getSourcePortStart() {
     public Integer getSourcePortEnd() {
         if (publicEndPort == null) {
             if (publicStartPort != null) {
-                return publicStartPort.intValue();
+                return publicStartPort;
             }
         } else {
-            return publicEndPort.intValue();
+            return publicEndPort;
         }
 
         return null;
@@ -247,11 +247,12 @@ public void create() {
                 }
             }
         }
-
         try {
             FirewallRule result = _firewallService.createIngressFirewallRule(this);
-            setEntityId(result.getId());
-            setEntityUuid(result.getUuid());
+            if (result != null) {
+                setEntityId(result.getId());
+                setEntityUuid(result.getUuid());
+            }
         } catch (NetworkRuleConflictException ex) {
             s_logger.info("Network rule conflict: " + ex.getMessage());
             s_logger.trace("Network Rule Conflict: ", ex);
diff --git a/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java b/engine/components-api/src/com/cloud/network/rules/StaticNatRuleImpl.java
@@ -38,8 +38,8 @@ public StaticNatRuleImpl(FirewallRuleVO rule, String dstIp) {
         xid = rule.getXid();
         uuid = rule.getUuid();
         protocol = rule.getProtocol();
-        portStart = rule.getSourcePortStart();
-        portEnd = rule.getSourcePortEnd();
+        portStart = rule.getSourcePortStart().intValue();
+        portEnd = rule.getSourcePortEnd().intValue();
         state = rule.getState();
         accountId = rule.getAccountId();
         domainId = rule.getDomainId();
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -363,7 +363,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                                     for (FirewallRule vpnFwRule : vpnFwRules) {
                                         _rulesDao.remove(vpnFwRule.getId());
                                         s_logger.debug("Successfully removed firewall rule with ip id=" + vpnFwRule.getSourceIpAddressId() + " and port " +
-                                            vpnFwRule.getSourcePortStart() + " as a part of vpn cleanup");
+                                            vpnFwRule.getSourcePortStart().intValue() + " as a part of vpn cleanup");
                                     }
                                 }
                             }
diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java
@@ -185,7 +185,7 @@ public ApplicationLoadBalancerRuleVO doInTransaction(TransactionStatus status) t
                         throw new CloudRuntimeException("Unable to update the state to add for " + newRule);
                     }
                     s_logger.debug("Load balancer " + newRule.getId() + " for Ip address " + newRule.getSourceIp().addr() + ", source port " +
-                        newRule.getSourcePortStart() + ", instance port " + newRule.getDefaultPortStart() + " is added successfully.");
+                        newRule.getSourcePortStart().intValue() + ", instance port " + newRule.getDefaultPortStart() + " is added successfully.");
                     CallContext.current().setEventDetails("Load balancer Id: " + newRule.getId());
                     Network ntwk = _networkModel.getNetwork(newRule.getNetworkId());
                     UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_CREATE, newRule.getAccountId(), ntwk.getDataCenterId(), newRule.getId(), null,
@@ -527,8 +527,8 @@ protected void detectInternalLbRulesConflict(ApplicationLoadBalancerRule newLbRu
                 (newLbRule.getSourcePortStart().intValue() <= lbRule.getSourcePortEnd().intValue() && newLbRule.getSourcePortEnd().intValue() >= lbRule.getSourcePortEnd()
                     .intValue())) {
 
-                throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart() + "-" + newLbRule.getSourcePortEnd() +
-                    ", conflicts with rule " + lbRule.getId() + " which has " + lbRule.getSourcePortStart() + "-" + lbRule.getSourcePortEnd());
+                throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart().intValue() + "-" + newLbRule.getSourcePortEnd().intValue() +
+                    ", conflicts with rule " + lbRule.getId() + " which has " + lbRule.getSourcePortStart().intValue() + "-" + lbRule.getSourcePortEnd().intValue());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public Long getSourceIpAddressId() {`
`177`	`177`	`@Override`
`178`	`178`	`public Integer getSourcePortStart() {`
`179`	`179`	`if (publicStartPort != null) {`
`180`		`- return publicStartPort.intValue();`
	`180`	`+ return publicStartPort;`
`181`	`181`	`}`
`182`	`182`	`return null;`
`183`	`183`	`}`
`@@ -186,10 +186,10 @@ public Integer getSourcePortStart() {`
`186`	`186`	`public Integer getSourcePortEnd() {`
`187`	`187`	`if (publicEndPort == null) {`
`188`	`188`	`if (publicStartPort != null) {`
`189`		`- return publicStartPort.intValue();`
	`189`	`+ return publicStartPort;`
`190`	`190`	`}`
`191`	`191`	`} else {`
`192`		`- return publicEndPort.intValue();`
	`192`	`+ return publicEndPort;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`return null;`
`@@ -247,11 +247,12 @@ public void create() {`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`}`
`250`		`-`
`251`	`250`	`try {`
`252`	`251`	`FirewallRule result = _firewallService.createIngressFirewallRule(this);`
`253`		`- setEntityId(result.getId());`
`254`		`- setEntityUuid(result.getUuid());`
	`252`	`+ if (result != null) {`
	`253`	`+ setEntityId(result.getId());`
	`254`	`+ setEntityUuid(result.getUuid());`
	`255`	`+ }`
`255`	`256`	`} catch (NetworkRuleConflictException ex) {`
`256`	`257`	`s_logger.info("Network rule conflict: " + ex.getMessage());`
`257`	`258`	`s_logger.trace("Network Rule Conflict: ", ex);`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {`
`363`	`363`	`for (FirewallRule vpnFwRule : vpnFwRules) {`
`364`	`364`	`_rulesDao.remove(vpnFwRule.getId());`
`365`	`365`	`s_logger.debug("Successfully removed firewall rule with ip id=" + vpnFwRule.getSourceIpAddressId() + " and port " +`
`366`		`- vpnFwRule.getSourcePortStart() + " as a part of vpn cleanup");`
	`366`	`+ vpnFwRule.getSourcePortStart().intValue() + " as a part of vpn cleanup");`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public ApplicationLoadBalancerRuleVO doInTransaction(TransactionStatus status) t`
`185`	`185`	`throw new CloudRuntimeException("Unable to update the state to add for " + newRule);`
`186`	`186`	`}`
`187`	`187`	`s_logger.debug("Load balancer " + newRule.getId() + " for Ip address " + newRule.getSourceIp().addr() + ", source port " +`
`188`		`- newRule.getSourcePortStart() + ", instance port " + newRule.getDefaultPortStart() + " is added successfully.");`
	`188`	`+ newRule.getSourcePortStart().intValue() + ", instance port " + newRule.getDefaultPortStart() + " is added successfully.");`
`189`	`189`	`CallContext.current().setEventDetails("Load balancer Id: " + newRule.getId());`
`190`	`190`	`Network ntwk = _networkModel.getNetwork(newRule.getNetworkId());`
`191`	`191`	`UsageEventUtils.publishUsageEvent(EventTypes.EVENT_LOAD_BALANCER_CREATE, newRule.getAccountId(), ntwk.getDataCenterId(), newRule.getId(), null,`
`@@ -527,8 +527,8 @@ protected void detectInternalLbRulesConflict(ApplicationLoadBalancerRule newLbRu`
`527`	`527`	`(newLbRule.getSourcePortStart().intValue() <= lbRule.getSourcePortEnd().intValue() && newLbRule.getSourcePortEnd().intValue() >= lbRule.getSourcePortEnd()`
`528`	`528`	`.intValue())) {`
`529`	`529`
`530`		`- throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart() + "-" + newLbRule.getSourcePortEnd() +`
`531`		`- ", conflicts with rule " + lbRule.getId() + " which has " + lbRule.getSourcePortStart() + "-" + lbRule.getSourcePortEnd());`
	`530`	`+ throw new NetworkRuleConflictException("The range specified, " + newLbRule.getSourcePortStart().intValue() + "-" + newLbRule.getSourcePortEnd().intValue() +`
	`531`	`+ ", conflicts with rule " + lbRule.getId() + " which has " + lbRule.getSourcePortStart().intValue() + "-" + lbRule.getSourcePortEnd().intValue());`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`