Merge
authorpliden
Mon, 14 Mar 2016 11:55:51 +0100
changeset 37089 56dfac39fc71
parent 37087 0b4b27f1b0b2 (diff)
parent 37088 2f2b21b4df00 (current diff)
child 37091 42ea16b55bf1
Merge
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java	Mon Mar 14 09:42:17 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java	Mon Mar 14 11:55:51 2016 +0100
@@ -81,6 +81,12 @@
   }
 
   public Symbol probe(byte[] name, long hash) {
+
+    if (bucketCount() == 0) {
+      // The table is invalid, so don't try to lookup
+      return null;
+    }
+
     long    symOffset;
     Symbol  sym;
     Address baseAddress = baseAddressField.getValue(addr);