[Engine-patches] Change in ovirt-engine[master]: core: findbugs + improving code

[yzaslavs]

Yair Zaslavsky has uploaded a new change for review.

Change subject: core: findbugs + improving code
......................................................................

core: findbugs + improving code

Fixing findbugs issue + improving code
readability

Change-Id: Icc7794df32b8d0f4cf08f7c5259b83a5a17db14f
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
1 file changed, 5 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/14065/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index f3cb35f..cd2d284 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -499,9 +499,8 @@
         vds.setUsageMemPercent(AssignIntValue(xmlRpcStruct, 
VdsProperties.mem_usage));
 
         // ------------- vds network statistics ---------------------
-        Map<String, Object> interfaces = (Map<String, Object>) ((xmlRpcStruct
-                .get(VdsProperties.NETWORK) instanceof Map) ? 
xmlRpcStruct.get(VdsProperties.NETWORK)
-                : null);
+        Map<String, Object> interfaces = (Map<String, Object>) xmlRpcStruct
+                .get(VdsProperties.NETWORK);
         if (interfaces != null) {
             int networkUsage = 0;
             for (String name : interfaces.keySet()) {
@@ -514,11 +513,7 @@
                 }
                 if (iface != null) {
                     iface.setVdsId(vds.getId());
-                    Map<String, Object> dictTemp =
-                            (Map<String, Object>) ((interfaces.get(name) 
instanceof Map) ? interfaces
-                                    .get(name)
-                                    : null);
-                    Map<String, Object> dict = dictTemp;
+                    Map<String, Object> dict = (Map<String, Object>) 
interfaces.get(name);
                     Double rx_rate = AssignDoubleValue(dict, 
VdsProperties.rx_rate);
                     Double rx_dropped = AssignDoubleValue(dict, 
VdsProperties.rx_dropped);
                     Double tx_rate = AssignDoubleValue(dict, 
VdsProperties.tx_rate);
@@ -1048,7 +1043,7 @@
                     }
 
                     Map<String, Object> config =
-                            (Map<String, Object>) ((bond.get("cfg") instanceof 
Map) ? bond.get("cfg") : null);
+                            (Map<String, Object>) bond.get("cfg");
 
                     if (config != null && config.get("BONDING_OPTS") != null) {
                         
iface.setBondOptions(config.get("BONDING_OPTS").toString());
@@ -1204,8 +1199,7 @@
             setGatewayIfManagementNetwork(iface, net.getGateway());
 
             if (bridgedNetwork) {
-                Map<String, Object> networkConfig =
-                        (Map<String, Object>) ((network.get("cfg") instanceof 
Map) ? network.get("cfg") : null);
+                Map<String, Object> networkConfig = (Map<String, Object>) 
network.get("cfg");
                 addBootProtocol(networkConfig, iface);
             }
         }


--
To view, visit http://gerrit.ovirt.org/14065
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc7794df32b8d0f4cf08f7c5259b83a5a17db14f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches