From e1b5717675646779553cebdfa510dbca17e2a30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 2 Nov 2018 09:09:13 +0100
Subject: [PATCH 1/2] Fix #1372

---
 .../resources/category/java/codestyle.xml     |  6 +++--
 .../codestyle/xml/UselessQualifiedThis.xml    | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index 3329ce7284..483d2e3a05 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -1950,7 +1950,9 @@ public class Foo {
           message="Useless qualified this usage in the same class."
           class="net.sourceforge.pmd.lang.rule.XPathRule"
           externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_codestyle.html#uselessqualifiedthis">
-        <description>Look for qualified this usages in the same class.</description>
+        <description>
+            Reports qualified this usages in the same class.
+        </description>
         <priority>3</priority>
         <properties>
             <property name="xpath">
@@ -1958,7 +1960,7 @@ public class Foo {
 <![CDATA[
 //PrimaryExpression
 [PrimaryPrefix/Name[@Image]]
-[PrimarySuffix[@Arguments='false']]
+[PrimarySuffix[@Arguments='false' and @ArrayDereference = 'false']]
 [not(PrimarySuffix/MemberSelector)]
 [ancestor::ClassOrInterfaceBodyDeclaration[1][@AnonymousInnerClass='false']]
 /PrimaryPrefix/Name[@Image = ancestor::ClassOrInterfaceDeclaration[1]/@Image]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessQualifiedThis.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessQualifiedThis.xml
index 2c8ba82356..f9044564af 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessQualifiedThis.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessQualifiedThis.xml
@@ -152,4 +152,27 @@ public class ApiExceptionCtrlAdvice {
 }
         ]]></code>
     </test-code>
+
+    <test-code>
+        <description>False positive for UselessQualifiedThis #1372</description>
+        <expected-problems>0</expected-problems>
+        <code>
+            <![CDATA[
+            public class Board {
+                private int[] Board;
+
+
+                public Board(int[] b) {
+                    for (int i = 0; i < b.length; i++)
+                        Board[i] = b[i];
+                }
+
+
+                public int size() {
+                    return Board.length;
+                }
+            }
+            ]]>
+        </code>
+    </test-code>
 </test-data>
\ No newline at end of file

From 81e19a15ef7c42aa690fe14e6866563cee7c2cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Mon, 5 Nov 2018 00:00:20 -0300
Subject: [PATCH 2/2] Update changelog, refs #1427

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 62caa38f96..d51c50d6b3 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -19,6 +19,8 @@ This is a {{ site.pmd.release_type }} release.
 *   all
     *   [#1318](https://github.com/pmd/pmd/issues/1318): \[test] Kotlin DSL to ease test writing
     *   [#1341](https://github.com/pmd/pmd/issues/1341): \[doc] Documentation Error with Regex Properties
+*   java-codestyle
+    *   [#1372](https://github.com/pmd/pmd/issues/1372): \[java] false positive for UselessQualifiedThis
 
 ### API Changes