[Engine-patches] Change in ovirt-engine[master]: core: minor cleanup in IrsBrokerCommand

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: minor cleanup in IrsBrokerCommand
......................................................................

core: minor cleanup in IrsBrokerCommand

1. use StringUtils#isEmpty instead of duplicating its logic

2. simplified getCurrentIrsProxyData method

Change-Id: I8ca113d5848c3b5cf2a9ec8b3e640eeeb3ebb393
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/17744/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
index b7fe7c4..cea8b75 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
@@ -16,6 +16,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
@@ -977,7 +978,7 @@
 
         public String getIsoPrefix() {
             synchronized (syncObj) {
-                if (mIsoPrefix == null || mIsoPrefix.length() == 0) {
+                if (StringUtils.isEmpty(mIsoPrefix)) {
                     try {
                         StoragePoolInfoReturnForXmlRpc returnValue = 
getIrsProxy().getStoragePoolInfo(
                                 _storagePoolId.toString());
@@ -1477,14 +1478,10 @@
     }
 
     protected IrsProxyData getCurrentIrsProxyData() {
-        IrsProxyData returnValue;
-        if (_irsProxyData.containsKey(getParameters().getStoragePoolId())) {
-            returnValue = 
_irsProxyData.get(getParameters().getStoragePoolId());
-        } else {
+        if (!_irsProxyData.containsKey(getParameters().getStoragePoolId())) {
             _irsProxyData.put(getParameters().getStoragePoolId(), new 
IrsProxyData(getParameters().getStoragePoolId()));
-            returnValue = 
_irsProxyData.get(getParameters().getStoragePoolId());
         }
-        return returnValue;
+        return _irsProxyData.get(getParameters().getStoragePoolId());
     }
 
     private int _failoverCounter;


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

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