am 16b5d29f: Merge "Guard against name == null in ShortDump"

* commit '16b5d29f1755e50ab92a3bee0b85b26460e69cf8':
  Guard against name == null in ShortDump

1 files changed, 5 insertions, 5 deletions

diff --git a/runtime/thread.cc b/runtime/thread.cc
index b27ad4ae3e..9f7c303af9 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -572,13 +572,13 @@ void Thread::ShortDump(std::ostream& os) const {
   if (GetThreadId() != 0) {
     // If we're in kStarting, we won't have a thin lock id or tid yet.
     os << GetThreadId()
-             << ",tid=" << GetTid() << ',';
+       << ",tid=" << GetTid() << ',';
   }
   os << GetState()
-           << ",Thread*=" << this
-           << ",peer=" << tlsPtr_.opeer
-           << ",\"" << *tlsPtr_.name << "\""
-           << "]";
+     << ",Thread*=" << this
+     << ",peer=" << tlsPtr_.opeer
+     << ",\"" << (tlsPtr_.name != nullptr ? *tlsPtr_.name : "null") << "\""
+     << "]";
 }
 
 void Thread::Dump(std::ostream& os) const {