Improve JDWP error handling.
In particular, we can't use NULL to mean "invalid"; some JDWP calls
legitimately need to handle NULL.
Change-Id: Iec4fac5521994bdb1f59677bd5af153684d4e266
diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index 285caf3..ddcc217 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -839,7 +839,7 @@
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total) "
- << "thread=" << (void*) basket.threadId << ")";
+ << "thread=" << (void*) basket.threadId << ")";
suspendPolicy = scanSuspendPolicy(matchList, match_count);
VLOG(jdwp) << " suspendPolicy=" << suspendPolicy;
@@ -932,10 +932,10 @@
FindMatchingEvents(EK_EXCEPTION, &basket, matchList, &match_count);
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total)"
- << " thread=" << (void*) basket.threadId
- << " exceptId=" << (void*) exceptionId
- << " caught=" << basket.caught << ")";
- VLOG(jdwp) << " throw: " << *pThrowLoc;
+ << " thread=" << (void*) basket.threadId
+ << " exceptId=" << (void*) exceptionId
+ << " caught=" << basket.caught << ")"
+ << " throw: " << *pThrowLoc;
if (pCatchLoc->classId == 0) {
VLOG(jdwp) << " catch: (not caught)";
} else {
@@ -1012,7 +1012,7 @@
FindMatchingEvents(EK_CLASS_PREPARE, &basket, matchList, &match_count);
if (match_count != 0) {
VLOG(jdwp) << "EVENT: " << matchList[0]->eventKind << "(" << match_count << " total) "
- << "thread=" << (void*) basket.threadId << ") " << signature;
+ << "thread=" << (void*) basket.threadId << ") " << signature;
suspendPolicy = scanSuspendPolicy(matchList, match_count);
VLOG(jdwp) << " suspendPolicy=" << suspendPolicy;