commit 4740cdff25875c530649a670b15e8ac52bfd7252
author Elliott Hughes <enh@google.com> Wed Dec 07 14:07:12 2011 -0800
committer Elliott Hughes <enh@google.com> Wed Dec 07 14:07:12 2011 -0800
tree 0ca835b636fe2b6854ba65bee2eee3c4ea983048
parent 0ad5bb8ea378a223eb6eaf89e0be2823c6f87c0e

Notify the debugger of class preparation.

Change-Id: Ic9863d0cc1176c474df2239a286a01393845d589

src/jdwp/jdwp_handler.cc

diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc
index 238775e..c7db5e9 100644
--- a/src/jdwp/jdwp_handler.cc
+++ b/src/jdwp/jdwp_handler.cc
@@ -176,7 +176,7 @@
 static JdwpError handleVM_Version(JdwpState* state, const uint8_t* buf, int dataLen, ExpandBuf* pReply) {
   /* text information on runtime version */
   std::string version(StringPrintf("Android Runtime %s", Runtime::Current()->GetVersion()));
-  expandBufAddUtf8String(pReply, version.c_str());
+  expandBufAddUtf8String(pReply, version);
   /* JDWP version numbers */
   expandBufAdd4BE(pReply, 1);        // major
   expandBufAdd4BE(pReply, 5);        // minor
@@ -442,7 +442,7 @@
 
     expandBufAdd1(pReply, refTypeTag);
     expandBufAddRefTypeId(pReply, classRefBuf[i]);
-    expandBufAddUtf8String(pReply, descriptor.c_str());
+    expandBufAddUtf8String(pReply, descriptor);
     expandBufAddUtf8String(pReply, genericSignature);
     expandBufAdd4BE(pReply, status);
   }
@@ -461,7 +461,7 @@
 
   LOG(VERBOSE) << StringPrintf("  Req for signature of refTypeId=0x%llx", refTypeId);
   std::string signature(Dbg::GetSignature(refTypeId));
-  expandBufAddUtf8String(pReply, signature.c_str());
+  expandBufAddUtf8String(pReply, signature);
 
   return ERR_NONE;
 }
@@ -503,7 +503,7 @@
   if (!Dbg::GetSourceFile(refTypeId, source_file)) {
     return ERR_ABSENT_INFORMATION;
   }
-  expandBufAddUtf8String(pReply, source_file.c_str());
+  expandBufAddUtf8String(pReply, source_file);
   return ERR_NONE;
 }
 
@@ -569,7 +569,7 @@
   LOG(VERBOSE) << StringPrintf("  Req for signature of refTypeId=0x%llx", refTypeId);
   std::string signature(Dbg::GetSignature(refTypeId));
   if (signature != NULL) {
-    expandBufAddUtf8String(pReply, signature.c_str());
+    expandBufAddUtf8String(pReply, signature);
   } else {
     LOG(WARNING) << StringPrintf("No signature for refTypeId=0x%llx", refTypeId);
     expandBufAddUtf8String(pReply, "Lunknown;");
@@ -862,7 +862,7 @@
 
   LOG(VERBOSE) << StringPrintf("  Req for str %llx --> '%s'", stringObject, str.c_str());
 
-  expandBufAddUtf8String(pReply, str.c_str());
+  expandBufAddUtf8String(pReply, str);
 
   return ERR_NONE;
 }
@@ -879,7 +879,7 @@
     return ERR_INVALID_THREAD;
   }
   LOG(VERBOSE) << StringPrintf("  Name of thread 0x%llx is \"%s\"", threadId, name.c_str());
-  expandBufAddUtf8String(pReply, name.c_str());
+  expandBufAddUtf8String(pReply, name);
 
   return ERR_NONE;
 }
@@ -1062,7 +1062,7 @@
   ObjectId threadGroupId = ReadObjectId(&buf);
   LOG(VERBOSE) << StringPrintf("  Req for name of threadGroupId=0x%llx", threadGroupId);
 
-  expandBufAddUtf8String(pReply, Dbg::GetThreadGroupName(threadGroupId).c_str());
+  expandBufAddUtf8String(pReply, Dbg::GetThreadGroupName(threadGroupId));
 
   return ERR_NONE;
 }