From 4a4b03fa014df6021d24e8e9e3e14e55edc1e5aa Mon Sep 17 00:00:00 2001 From: Edison Su Date: Thu, 9 Jun 2011 18:04:41 -0400 Subject: [PATCH] fix user data --- agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java b/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java index 8b8cbb3fcf7..167787391e9 100644 --- a/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java +++ b/agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java @@ -112,7 +112,7 @@ public class JettyVmDataServer implements VmDataServer { resp.setStatus(HttpServletResponse.SC_OK); String userData = _vmDataServer.getVmDataItem(requester, USER_DATA); if (userData != null){ - resp.getWriter().println(); + resp.getWriter().println(userData); } else { resp.setStatus(HttpServletResponse.SC_NOT_FOUND); resp.sendError(HttpServletResponse.SC_NOT_FOUND, "Request not found"); @@ -185,7 +185,7 @@ public class JettyVmDataServer implements VmDataServer { String line = null; while (( line = input.readLine()) != null){ if (NetUtils.isValidIp(line)) { - _ipVmMap.put(line, dir); + _ipVmMap.put(line, vm); s_logger.info("Found ip " + line + " for vm " + vm); } else { s_logger.info("Invalid ip " + line + " for vm " + vm);