1) Add VMDK format

Kelven Yang · Kelven Yang · commit 49900a8985ba · 2010-08-24T18:58:38.000-07:00
2) Make console proxy servlet explictly return content-type header for console proxy page (this is a bug fix change)
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
@@ -22,7 +22,8 @@ public static enum ImageFormat {
         QCOW2(true, true, false),
         RAW(false, false, false),
         VHD(true, true, true),
-        ISO(false, false, false);
+        ISO(false, false, false),
+        VMDK(true, true, true);
         
         private final boolean thinProvisioned;
         private final boolean supportSparse;
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -281,7 +281,7 @@ private String composeConsoleAccessUrl(String rootUrl, VMInstanceVO vm, HostVO h
 	}
 	
 	private void sendResponse(HttpServletResponse resp, String content) {
-		try {
+		try {
 			resp.getWriter().print(content);
 		} catch(IOException e) {
 			if(s_logger.isInfoEnabled())

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ private String composeConsoleAccessUrl(String rootUrl, VMInstanceVO vm, HostVO h`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`private void sendResponse(HttpServletResponse resp, String content) {`
`284`		`- try {`
	`284`	`+ try {`
`285`	`285`	`resp.getWriter().print(content);`
`286`	`286`	`} catch(IOException e) {`
`287`	`287`	`if(s_logger.isInfoEnabled())`