--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Wed Apr 23 06:35:28 2008 -0400
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Mon Apr 28 08:08:12 2008 -0700
@@ -2229,6 +2229,8 @@
 #ifndef PRODUCT
 bool AdapterHandlerLibrary::contains(CodeBlob* b) {
 
+  if (_handlers == NULL) return false;
+
   for (int i = 0 ; i < _handlers->length() ; i++) {
     AdapterHandlerEntry* a = get_entry(i);
     if ( a != NULL && b == CodeCache::find_blob(a->get_i2c_entry()) ) return true;