[Engine-patches] Change in ovirt-engine[master]: core: cleanup VdsManager dispose

[piotr . kliczewski]

Piotr Kliczewski has uploaded a new change for review.

Change subject: core: cleanup VdsManager dispose
......................................................................

core: cleanup VdsManager dispose

Some time ago we promoted getHttpClient method to IVdsServer interface
so explicit cast is not required.


Change-Id: I204a60f20a19e79a431c9cb463073d160a5862a4
Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/32757/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 750a029..9d16924 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -63,7 +63,6 @@
 import org.ovirt.engine.core.vdsbroker.vdsbroker.IVdsServer;
 import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSNetworkException;
 import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSRecoveringException;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsServerWrapper;
 import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcUtils;
 
 public class VdsManager {
@@ -718,9 +717,8 @@
     public void dispose() {
         log.info("vdsManager::disposing");
         SchedulerUtilQuartzImpl.getInstance().deleteJob(onTimerJobId);
-        if (VdsServerWrapper.class.isInstance(_vdsProxy)) {
-            XmlRpcUtils.shutDownConnection(((VdsServerWrapper) 
_vdsProxy).getHttpClient());
-        } else {
+        XmlRpcUtils.shutDownConnection(_vdsProxy.getHttpClient());
+        if (JsonRpcVdsServer.class.isInstance(_vdsProxy)) {
             ((JsonRpcVdsServer) _vdsProxy).close();
         }
     }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I204a60f20a19e79a431c9cb463073d160a5862a4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches