*** old/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Wed Apr 29 16:51:16 2015
--- new/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Wed Apr 29 16:51:16 2015

*** 25,37 ****
--- 25,35 ----
  package sun.jvm.hotspot;
  
  import java.io.*;
  import java.awt.*;
  import java.awt.event.*;
  import java.math.*;
  import javax.swing.*;
  import javax.swing.tree.*;
  import java.util.*;
  
  import sun.jvm.hotspot.code.*;
  import sun.jvm.hotspot.compiler.*;
  import sun.jvm.hotspot.debugger.*;

*** 926,936 ****
--- 924,934 ----
              // later attempt to get an oop map for that instruction. For
              // now, we warn if we find such a method.
              boolean shouldSkipOopMaps = false;
              if (curVFrame.isCompiledFrame()) {
                CodeBlob cb = VM.getVM().getCodeCache().findBlob(curFrame.getPC());
!               ImmutableOopMapSet maps = cb.getOopMaps();
                if ((maps == null) || (maps.getSize() == 0)) {
                  shouldSkipOopMaps = true;
                }
              }
  

*** 975,985 ****
--- 973,983 ----
                  nextFrame = nextVFrame.getFrame();
                }
              } while (nextVFrame != null && nextFrame.equals(curFrame));
  
              if (shouldSkipOopMaps) {
!               anno = anno + "\nNOTE: null or empty ImmutableOopMapSet found for this CodeBlob";
              }
  
              if (curFrame.getFP() != null) {
                annoPanel.addAnnotation(new Annotation(curFrame.getSP(),
                                                       curFrame.getFP(),