# HG changeset patch
# User jiangli
# Date 1377604738 25200
# Node ID 2b6cbd616013d88a225250345dcb6e304f44a71c
# Parent  2dd459817aae95bf55b55793ef734b0a2688e7eb# Parent  243b76d51b691039ece6fd0daf2ca81cc52643b9
Merge

diff -r 2dd459817aae -r 2b6cbd616013 hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Tue Aug 27 01:21:22 2013 -0700
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Tue Aug 27 04:58:58 2013 -0700
@@ -354,9 +354,16 @@
   public boolean   getIsMarkedDependent()   { return                isMarkedDependent.getValue(this) != 0; }
   public long      getVtableLen()           { return                vtableLen.getValue(this); }
   public long      getItableLen()           { return                itableLen.getValue(this); }
-  public Symbol    getGenericSignature()    { return                getConstants().getSymbolAt(genericSignatureIndex.getValue(this)); }
   public long      majorVersion()           { return                majorVersion.getValue(this); }
   public long      minorVersion()           { return                minorVersion.getValue(this); }
+  public Symbol    getGenericSignature()    {
+    long index = genericSignatureIndex.getValue(this);
+    if (index != 0) {
+      return getConstants().getSymbolAt(index);
+    } else {
+      return null;
+    }
+  }
 
   // "size helper" == instance size in words
   public long getSizeHelper() {