From a24cbf034bd55a720b50b679b686db782b69cc89 Mon Sep 17 00:00:00 2001
From: alberto <infjaf@gmail.com>
Date: Sat, 21 Sep 2013 17:53:06 +0200
Subject: [PATCH] Recognize custom close method #1130

---
 .../java/rule/design/CloseResourceRule.java   | 13 ++++++++++
 .../java/rule/design/xml/CloseResource.xml    | 24 +++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
index 969c452e15..f578f4e2a5 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
@@ -160,6 +160,19 @@ public class CloseResourceRule extends AbstractJavaRule {
                         closed = true;
                         break;
                     }
+					if (name.contains(".")) {
+						String[] parts = name.split("\\.");
+						if (parts.length == 2) {
+							String methodName = parts[1];
+							String varName = parts[0];
+							if (varName.equals(variableToClose)
+									&& closeTargets.contains(methodName)) {
+								closed = true;
+								break;
+							}
+
+						}
+					}
                 }
                 if (closed) {
                     break;
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
index 2fa53e4337..898afa53b7 100644
--- a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
+++ b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
@@ -153,7 +153,7 @@ New use case
      ]]></description>
         <rule-property name="closeTargets">commit,close,close,close</rule-property>
         <rule-property name="types">DAOTransaction,Connection,Statement,ResulSet</rule-property>
-        <expected-problems>2</expected-problems>
+        <expected-problems>1</expected-problems>
         <code><![CDATA[
 import java.sql.*;
 public class Foo {
@@ -425,4 +425,24 @@ public class Test {
 }
         ]]></code>
     </test-code>
-</test-data>
+    
+    <test-code>
+        <description><![CDATA[Custom close method, should be ok]]></description>
+        <rule-property name="closeTargets">cleanup</rule-property>
+        <rule-property name="types">MyClass</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Foo {
+   void bar() {
+       MyClass myClass = null;
+       try {
+           myClass = new MyClass();
+       } catch (Exception e) {
+       } finally {
+            myClass.cleanup(); // should be ok, it's closed with cleanup
+       }
+    }
+ }
+  ]]></code>
+        </test-code>
+    </test-data>