Mercurial > hg > truffle

diff src/share/vm/runtime/perfData.cpp @ 6911:d2582a08fa5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 18 Oct 2012 21:58:55 -0700
parents fb19af007ffc
children 203f64878aab
line wrap: on
line diff
--- a/src/share/vm/runtime/perfData.cpp	Thu Oct 11 15:29:16 2012 -0700
+++ b/src/share/vm/runtime/perfData.cpp	Thu Oct 18 21:58:55 2012 -0700
@@ -588,6 +588,10 @@
 
 PerfData* PerfDataList::find_by_name(const char* name) {
 
+  // if add_item hasn't been called the list won't be initialized
+  if (this == NULL)
+    return NULL;
+
   int i = _set->find((void*)name, PerfDataList::by_name);
 
   if (i >= 0 && i <= _set->length())