From 25e9918c5791a74bc4840ec6d6bf9e9ece397a68 Mon Sep 17 00:00:00 2001 From: weingartner Date: Mon, 6 Jul 2015 13:14:27 -0300 Subject: [PATCH] Amend last commit, used 4 spaces in code formatting instead of 1 tab character. Signed-off-by: wilderrodrigues This closes #560 --- .../xenserver/resource/XcpOssResource.java | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java index 2922a0f2836..b2f403dbbc2 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XcpOssResource.java @@ -35,38 +35,36 @@ import com.xensource.xenapi.VM; @Local(value = ServerResource.class) public class XcpOssResource extends CitrixResourceBase { - private static final long mem_32m = 33554432L; + private static final long mem_32m = 33554432L; - @Override - protected List getPatchFiles() { - final List files = new ArrayList(); - final String patch = "scripts/vm/hypervisor/xenserver/xcposs/patch"; - final String patchfilePath = Script.findScript("", patch); - if (patchfilePath == null) { - throw new CloudRuntimeException("Unable to find patch file " - + patch); - } - final File file = new File(patchfilePath); - files.add(file); - return files; - } + @Override + protected List getPatchFiles() { + final List files = new ArrayList(); + final String patch = "scripts/vm/hypervisor/xenserver/xcposs/patch"; + final String patchfilePath = Script.findScript("", patch); + if (patchfilePath == null) { + throw new CloudRuntimeException("Unable to find patch file " + + patch); + } + final File file = new File(patchfilePath); + files.add(file); + return files; + } - @Override - protected String getGuestOsType(final String stdType, - final String platformEmulator, final boolean bootFromCD) { - if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) { - return "Debian Squeeze 6.0 (64-bit)"; - } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) { - return "CentOS 5 (64-bit)"; - } else { - return super.getGuestOsType(stdType, platformEmulator, bootFromCD); - } - } + @Override + protected String getGuestOsType(final String stdType, + final String platformEmulator, final boolean bootFromCD) { + if (stdType.equalsIgnoreCase("Debian GNU/Linux 6(64-bit)")) { + return "Debian Squeeze 6.0 (64-bit)"; + } else if (stdType.equalsIgnoreCase("CentOS 5.6 (64-bit)")) { + return "CentOS 5 (64-bit)"; + } else { + return super.getGuestOsType(stdType, platformEmulator, bootFromCD); + } + } - @Override - protected void setMemory(final Connection conn, final VM vm, - final long minMemsize, final long maxMemsize) - throws XmlRpcException, XenAPIException { - vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize); - } + @Override + protected void setMemory(final Connection conn, final VM vm, long minMemsize, final long maxMemsize) throws XmlRpcException, XenAPIException { + vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize); + } }