Merge pull request #2135 from shapeblue/force-stop-vm-kvm

karuturi · web-flow · commit 52232b92a01b · 2017-06-07T11:04:32.000+05:30
[BLOCKER] CLOUDSTACK-9860: Fix stackoverflow issue
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2733,7 +2733,7 @@ public String stopVM(final Connect conn, final String vmName, final boolean forc
         if (forceStop) {
             return stopVMInternal(conn, vmName, true);
         }
-        String ret = stopVM(conn, vmName, false);
+        String ret = stopVMInternal(conn, vmName, false);
         if (ret == Script.ERR_TIMEOUT) {
             ret = stopVMInternal(conn, vmName, true);
         } else if (ret != null) {

Original file line number	Diff line number	Diff line change
`@@ -2733,7 +2733,7 @@ public String stopVM(final Connect conn, final String vmName, final boolean forc`
`2733`	`2733`	`if (forceStop) {`
`2734`	`2734`	`return stopVMInternal(conn, vmName, true);`
`2735`	`2735`	`}`
`2736`		`- String ret = stopVM(conn, vmName, false);`
	`2736`	`+ String ret = stopVMInternal(conn, vmName, false);`
`2737`	`2737`	`if (ret == Script.ERR_TIMEOUT) {`
`2738`	`2738`	`ret = stopVMInternal(conn, vmName, true);`
`2739`	`2739`	`} else if (ret != null) {`