Merge
authordsamersoff
Mon, 14 Mar 2016 09:07:34 +0000
changeset 37087 0b4b27f1b0b2
parent 37085 53ccf09a724f (current diff)
parent 37086 e152767075ce (diff)
child 37089 56dfac39fc71
Merge
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java	Mon Mar 14 09:11:21 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java	Mon Mar 14 09:07:34 2016 +0000
@@ -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);