From bb787a865663ff7613ccf99540aaa48e8a3c3ce8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 24 Jun 2011 12:21:08 +0400 Subject: [PATCH] EA-28513 (NPE fixed) --- .../daemon/impl/analysis/HighlightControlFlowUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java index 94f379eb94f7..0c4ac7193054 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2011 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. @@ -687,7 +687,7 @@ public class HighlightControlFlowUtil { else { scope = new PsiElement[]{variable.getParent()}; } - if (scope.length < 1 || scope[0].getContainingFile() != context.getContainingFile()) return null; + if (scope.length < 1 || scope[0] == null || scope[0].getContainingFile() != context.getContainingFile()) return null; PsiElement parent = context.getParent(); PsiElement prevParent = context;