commit a3ae2b7c6598e9b1cf08e42ae4a8de38237b181b
author Elliott Hughes <enh@google.com> Fri Feb 24 15:10:51 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Feb 24 15:10:51 2012 -0800
tree ee24e45362429cbee3ff589ad45f30ed873778d5
parent 345689696f8a25db7d3a4b43b6a8afe8f4e22ba9

Implement VirtualMachine.ClassPaths correctly.

Change-Id: I71d9b675b0b167d9e5628e4d41b0747f77f1e845

src/jdwp/jdwp_handler.cc

diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc
index fed1cf9..284ca64 100644
--- a/src/jdwp/jdwp_handler.cc
+++ b/src/jdwp/jdwp_handler.cc
@@ -337,28 +337,21 @@
   return ERR_NONE;
 }
 
-/*
- * Return classpath and bootclasspath.
- */
 static JdwpError handleVM_ClassPaths(JdwpState* state, const uint8_t* buf, int dataLen, ExpandBuf* pReply) {
-  char baseDir[2] = "/";
+  expandBufAddUtf8String(pReply, "/");
 
-  /*
-   * TODO: make this real.  Not important for remote debugging, but
-   * might be useful for local debugging.
-   */
-  uint32_t classPaths = 1;
-  uint32_t bootClassPaths = 0;
-
-  expandBufAddUtf8String(pReply, baseDir);
-  expandBufAdd4BE(pReply, classPaths);
-  for (uint32_t i = 0; i < classPaths; i++) {
-    expandBufAddUtf8String(pReply, ".");
+  std::vector<std::string> class_path;
+  Split(Runtime::Current()->GetClassPathString(), ':', class_path);
+  expandBufAdd4BE(pReply, class_path.size());
+  for (size_t i = 0; i < class_path.size(); ++i) {
+    expandBufAddUtf8String(pReply, class_path[i]);
   }
 
-  expandBufAdd4BE(pReply, bootClassPaths);
-  for (uint32_t i = 0; i < classPaths; i++) {
-    /* add bootclasspath components as strings */
+  std::vector<std::string> boot_class_path;
+  Split(Runtime::Current()->GetBootClassPathString(), ':', boot_class_path);
+  expandBufAdd4BE(pReply, boot_class_path.size());
+  for (size_t i = 0; i < boot_class_path.size(); ++i) {
+    expandBufAddUtf8String(pReply, boot_class_path[i]);
   }
 
   return ERR_NONE;