From c6124c27370a591fd5f2d21c597bcd5c049592ef Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 9 Jan 2015 18:04:24 +0100 Subject: [PATCH] IDEA-135051 NullPointerException when trying to open an old .ipr project with IDEA 14 --- .../impl/javaCompiler/javac/JavacConfigurationMacroFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurationMacroFilter.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurationMacroFilter.java index 5ca3b9c75ea2..d9d93529ba9a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurationMacroFilter.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurationMacroFilter.java @@ -30,7 +30,7 @@ public class JavacConfigurationMacroFilter extends PathMacroFilter { if (parent != null && "option".equals(parent.getName()) && "ADDITIONAL_OPTIONS_STRING".equals(parent.getAttributeValue("name"))) { Element grandParent = parent.getParentElement(); return grandParent != null && grandParent.getName().equals("component") - && grandParent.getAttributeValue("name").equals("JavacSettings"); + && "JavacSettings".equals(grandParent.getAttributeValue("name")); } } return false;