From 39e59dd02f117e0445bebdf7f7a09031564c62cd Mon Sep 17 00:00:00 2001
From: Xavier Le Vourch <xlv@users.sourceforge.net>
Date: Wed, 3 Sep 2008 20:22:39 +0000
Subject: [PATCH] merged from trunk: Fixed bug 1481051 - false +
 UnusedNullCheckInEquals (and other false positives too)

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@6440 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/etc/changelog.txt                         |  2 ++
 .../basic/xml/UnusedNullCheckInEquals.xml     | 27 +++++++++++++++++++
 pmd/rulesets/basic.xml                        |  4 +--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 08dd952f1f..8c00028599 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -1,5 +1,7 @@
 ???? - 4.2.4:
 
+Fixed bug 1481051 - false + UnusedNullCheckInEquals (and other false positives too)
+
 August 31, 2008 - 4.2.3:
 
 JavaCC generated artifacts updated to JavaCC 4.1d1.
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnusedNullCheckInEquals.xml b/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnusedNullCheckInEquals.xml
index 81b47669f1..9ef0ac3648 100644
--- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnusedNullCheckInEquals.xml
+++ b/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/UnusedNullCheckInEquals.xml
@@ -50,6 +50,33 @@ public class Foo {
   if (x != null && "Foo".equals(y)) {} 
   if (y.equals(x)) {} 
  }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+var is not used in equals() call
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Foo {
+ public void bar() {
+  if (c != null && A.b(c).equals(d)) {}
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+[ 1481051 ] false + UnusedNullCheckInEquals
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Foo {
+ public void bar() {
+if(o1!=null && o1[0] != null && o2[0].getName()!=null && o2[0].getName().equals(o1[0].getName()) ){ }
+if(o1!=null && o2.equals(o1.getName()) ){ }
+ }
 }
      ]]></code>
     </test-code>
diff --git a/pmd/rulesets/basic.xml b/pmd/rulesets/basic.xml
index a305d3ed0f..e44b0ce02c 100644
--- a/pmd/rulesets/basic.xml
+++ b/pmd/rulesets/basic.xml
@@ -873,8 +873,8 @@ public class Foo {
         <value>
         <![CDATA[
 //PrimarySuffix[@Image='equals' and not(../PrimaryPrefix/Literal)]
- /../PrimarySuffix/Arguments/ArgumentList/Expression
- /PrimaryExpression/PrimaryPrefix
+ /following-sibling::PrimarySuffix/Arguments/ArgumentList/Expression
+ /PrimaryExpression[count(PrimarySuffix)=0]/PrimaryPrefix
  /Name[@Image = ./../../../../../../../../../../Expression/ConditionalAndExpression
  /EqualityExpression[@Image="!=" and count(./preceding-sibling::*)=0 and
  ./PrimaryExpression/PrimaryPrefix/Literal/NullLiteral]