# HG changeset patch
# User dsamersoff
# Date 1457946454 0
# Node ID 0b4b27f1b0b2219129f6412ad12ce0b3828c10b2
# Parent  53ccf09a724f8e460c3a4b07e316269418ef4862# Parent  e152767075cee992065cd4b43675935ad225a26a
Merge

diff -r 53ccf09a724f -r 0b4b27f1b0b2 hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/CompactHashTable.java
--- 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);