From 5baa4a2194aef5175cc1627892f9ffcdb8a21f8d Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 8 Sep 2009 13:34:01 +0400 Subject: [PATCH] Maven: npe in jdomutil (IDEADEV-39520) --- platform/util/src/com/intellij/openapi/util/JDOMUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java index e322022955da..899c017e9af6 100644 --- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java +++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java @@ -70,7 +70,7 @@ public class JDOMUtil { public static boolean areElementsEqual(Element e1, Element e2) { if (e1 == null && e2 == null) return true; - if (e1 == null) return false; + if (e1 == null || e2 == null) return false; return attListsEqual(e1.getAttributes(), e2.getAttributes()) && contentListsEqual(e1.getContent(CONTENT_FILTER), e2.getContent(CONTENT_FILTER)); @@ -235,7 +235,7 @@ public class JDOMUtil { private static boolean contentListsEqual(final List c1, final List c2) { if (c1 == null && c2 == null) return true; - if (c1 == null) return false; + if (c1 == null || c2 == null) return false; Iterator l1 = c1.listIterator(); Iterator l2 = c2.listIterator();