From fc1bdfdb8d646394555c104c02241eaca74c7fda Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Tue, 30 Dec 2014 19:39:18 +0100
Subject: [PATCH] SSR: second attempt to fix NPE (EA-63773)

---
 .../intellij/structuralsearch/impl/matcher/MatcherImpl.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
index 92b6568c28c0..678b99cf2146 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
@@ -145,10 +145,7 @@ public class MatcherImpl {
       visitor.matchContext(matchedNodes);
     } finally {
       matchedNodes.reset();
-      final MatchOptions options = matchContext.getOptions();
-      if (options != null) {
-        options.setScope(null);
-      }
+      context.getOptions().setScope(null);
     }
   }