Shireesh Anjal has uploaded a new change for review. Change subject: engine: Removed unnecessary 'continue' statements ......................................................................
engine: Removed unnecessary 'continue' statements Change-Id: I98b93b739db7d41384cf6455e43e0b4f3182d2ff Signed-off-by: Shireesh Anjal <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeAdvancedDetails.java 2 files changed, 20 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/9083/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java index e177389..f6534ac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterManager.java @@ -134,7 +134,6 @@ log.errorFormat("Error while refreshing Gluster lightweight data of cluster {0}!", cluster.getname(), e); - continue; } } } @@ -189,13 +188,11 @@ try { removeServerFromDb(server); + // remove the server from resource manager + runVdsCommand(VDSCommandType.RemoveVds, new RemoveVdsVDSCommandParameters(server.getId())); } catch (Exception e) { log.errorFormat("Error while removing server {0} from database!", server.getvds_name(), e); - continue; } - - // remove the server from resource manager - runVdsCommand(VDSCommandType.RemoveVds, new RemoveVdsVDSCommandParameters(server.getId())); } } } @@ -441,7 +438,6 @@ createVolume(volume); } catch (Exception e) { log.errorFormat("Could not save volume {0} in database!", volume.getName(), e); - continue; } } else { try { @@ -450,7 +446,6 @@ updateVolume(existingVolume, volume); } catch (Exception e) { log.errorFormat("Error while updating Volume {0}!", volume.getName(), e); - continue; } } } @@ -682,7 +677,6 @@ fetchedOption, existingVolume.getName(), e); - continue; } } else if (!existingOption.getValue().equals(fetchedOption.getValue())) { logAuditMessage(existingVolume.getClusterId(), existingVolume, null, @@ -701,7 +695,6 @@ fetchedOption, existingVolume.getName(), e); - continue; } } } @@ -769,7 +762,6 @@ log.errorFormat("Error while refreshing Gluster heavyweight data of cluster {0}!", cluster.getname(), e); - continue; } } } @@ -793,7 +785,6 @@ volume.getName(), cluster.getname(), e); - continue; } } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeAdvancedDetails.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeAdvancedDetails.java index 8ace4e0..6c59d78 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeAdvancedDetails.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeAdvancedDetails.java @@ -28,14 +28,12 @@ public void copyDetailsFrom(GlusterVolumeAdvancedDetails volumeAdvancedDetails) { for (BrickDetails newBrickDetails : volumeAdvancedDetails.getBrickDetails()) { Guid newBrickId = newBrickDetails.getBrickProperties().getBrickId(); - if (newBrickId == null) { - continue; - } - - for (BrickDetails brickDetails : getBrickDetails()) { - if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { - copyBrickProperties(newBrickDetails.getBrickProperties(), brickDetails.getBrickProperties()); - break; + if (newBrickId != null) { + for (BrickDetails brickDetails : getBrickDetails()) { + if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { + copyBrickProperties(newBrickDetails.getBrickProperties(), brickDetails.getBrickProperties()); + break; + } } } } @@ -59,13 +57,12 @@ public void copyClientsFrom(GlusterVolumeAdvancedDetails volumeAdvancedDetails) { for (BrickDetails newBrickDetails : volumeAdvancedDetails.getBrickDetails()) { Guid newBrickId = newBrickDetails.getBrickProperties().getBrickId(); - if (newBrickId == null) { - continue; - } - for (BrickDetails brickDetails : getBrickDetails()) { - if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { - brickDetails.setClients(newBrickDetails.getClients()); - break; + if (newBrickId != null) { + for (BrickDetails brickDetails : getBrickDetails()) { + if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { + brickDetails.setClients(newBrickDetails.getClients()); + break; + } } } } @@ -74,13 +71,12 @@ public void copyMemoryFrom(GlusterVolumeAdvancedDetails volumeAdvancedDetails) { for (BrickDetails newBrickDetails : volumeAdvancedDetails.getBrickDetails()) { Guid newBrickId = newBrickDetails.getBrickProperties().getBrickId(); - if (newBrickId == null) { - continue; - } - for (BrickDetails brickDetails : getBrickDetails()) { - if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { - brickDetails.setMemoryStatus(newBrickDetails.getMemoryStatus()); - break; + if (newBrickId != null) { + for (BrickDetails brickDetails : getBrickDetails()) { + if (newBrickId.equals(brickDetails.getBrickProperties().getBrickId())) { + brickDetails.setMemoryStatus(newBrickDetails.getMemoryStatus()); + break; + } } } } -- To view, visit http://gerrit.ovirt.org/9083 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98b93b739db7d41384cf6455e43e0b4f3182d2ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shireesh Anjal <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
