src/hotspot/share/runtime/perfData.cpp

@@ -321,11 +321,16 @@
     _sampled->append(p);
   }
 }
 
 PerfData* PerfDataManager::find_by_name(const char* name) {
+  // if add_item hasn't been called the list won't be initialized
+  if (_all != NULL) {
   return _all->find_by_name(name);
+  } else {
+    return NULL;
+  }
 }
 
 PerfDataList* PerfDataManager::all() {
 
   MutexLocker ml(PerfDataManager_lock);

@@ -589,14 +594,10 @@
   return strcmp((const char*)name, pd->name()) == 0;
 }
 
 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())
     return _set->at(i);
   else