From 49900a8985ba7ba660db77bdb9e956f6b1599195 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Tue, 24 Aug 2010 18:58:38 -0700
Subject: [PATCH] 1) Add VMDK format 2) Make console proxy servlet explictly
 return content-type header for console proxy page (this is a bug fix change)

---
 api/src/com/cloud/storage/Storage.java                | 3 ++-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
index 106616673b3..24ceb5b3fec 100644
--- a/api/src/com/cloud/storage/Storage.java
+++ b/api/src/com/cloud/storage/Storage.java
@@ -22,7 +22,8 @@ public class Storage {
         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
index 851860f8a04..03372cbd82a 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -281,7 +281,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 	}
 	
 	private void sendResponse(HttpServletResponse resp, String content) {
-		try {
+		try {
 			resp.getWriter().print(content);
 		} catch(IOException e) {
 			if(s_logger.isInfoEnabled())