From f207fa4f1d7dc099ccd161e1ddeb5daadb173567 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 19 Jul 2016 18:23:37 +0300
Subject: [PATCH] EA-85776 - NPE: MethodBytecodeUtil.visit

---
 .../intellij/debugger/jdi/MethodBytecodeUtil.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
index c994079ed0d3..d84212cfb063 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.debugger.jdi;
 
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.ThrowableConsumer;
 import com.sun.jdi.*;
 import org.jetbrains.annotations.NotNull;
@@ -52,13 +53,23 @@ public class MethodBytecodeUtil {
     visit(classType, method, bytecodes, methodVisitor);
   }
 
+  public static byte[] getConstantPool(ReferenceType type) {
+    try {
+      return type.constantPool();
+    }
+    catch (NullPointerException e) { // workaround for JDK bug 6822627
+      ReflectionUtil.resetField(type, "constantPoolInfoGotten");
+      return type.constantPool();
+    }
+  }
+
   private static void visit(ReferenceType type, Method method, byte[] bytecodes, MethodVisitor methodVisitor) {
     try {
       try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos)) {
         dos.writeInt(0xCAFEBABE); // magic
         dos.writeInt(Opcodes.V1_8); // version
         dos.writeShort(type.constantPoolCount()); // constant_pool_count
-        dos.write(type.constantPool()); // constant_pool
+        dos.write(getConstantPool(type)); // constant_pool
         dos.writeShort(0); //             access_flags;
         dos.writeShort(0); //             this_class;
         dos.writeShort(0); //             super_class;