From c1e0ceb776dbad86f72ca5d69d2ea5376e676d27 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 18 Mar 2015 20:33:17 +0300
Subject: [PATCH] EA-66224 - NPE: BreakpointManager.applyThreadFilter

---
 .../ui/breakpoints/BreakpointManager.java     | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index 25bc97b0781a..9f903a8c531a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -638,27 +638,28 @@ public class BreakpointManager {
       }
 
       final EventRequestManager eventRequestManager = requestManager.getVMRequestManager();
+      if (eventRequestManager != null) {
+        new FilterSetter<BreakpointRequest>() {
+          @Override
+          protected void addFilter(@NotNull final BreakpointRequest request, final ThreadReference thread) {
+            request.addThreadFilter(thread);
+          }
+        }.applyFilter(eventRequestManager.breakpointRequests(), newFilterThread);
 
-      new FilterSetter<BreakpointRequest>() {
-        @Override
-        protected void addFilter(@NotNull final BreakpointRequest request, final ThreadReference thread) {
-          request.addThreadFilter(thread);
-        }
-      }.applyFilter(eventRequestManager.breakpointRequests(), newFilterThread);
+        new FilterSetter<MethodEntryRequest>() {
+          @Override
+          protected void addFilter(@NotNull final MethodEntryRequest request, final ThreadReference thread) {
+            request.addThreadFilter(thread);
+          }
+        }.applyFilter(eventRequestManager.methodEntryRequests(), newFilterThread);
 
-      new FilterSetter<MethodEntryRequest>() {
-        @Override
-        protected void addFilter(@NotNull final MethodEntryRequest request, final ThreadReference thread) {
-          request.addThreadFilter(thread);
-        }
-      }.applyFilter(eventRequestManager.methodEntryRequests(), newFilterThread);
-
-      new FilterSetter<MethodExitRequest>() {
-        @Override
-        protected void addFilter(@NotNull final MethodExitRequest request, final ThreadReference thread) {
-          request.addThreadFilter(thread);
-        }
-      }.applyFilter(eventRequestManager.methodExitRequests(), newFilterThread);
+        new FilterSetter<MethodExitRequest>() {
+          @Override
+          protected void addFilter(@NotNull final MethodExitRequest request, final ThreadReference thread) {
+            request.addThreadFilter(thread);
+          }
+        }.applyFilter(eventRequestManager.methodExitRequests(), newFilterThread);
+      }
     }
   }