From ee5b6f85cfda2f394dcc91feaccdf66f47f30270 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 31 Mar 2011 13:02:20 +0000
Subject: [PATCH] Feedback on
 https://issues.apache.org/bugzilla/show_bug.cgi?id=50991 Change the default

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087286 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/deploy/ContextResource.java | 2 +-
 webapps/docs/changelog.xml                           | 4 +++-
 webapps/docs/config/context.xml                      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/deploy/ContextResource.java b/java/org/apache/catalina/deploy/ContextResource.java
index dbe85268d..1470bff14 100644
--- a/java/org/apache/catalina/deploy/ContextResource.java
+++ b/java/org/apache/catalina/deploy/ContextResource.java
@@ -87,7 +87,7 @@ public class ContextResource extends ResourceBase {
      * the clean-up of resources that would otherwise happen via garbage
      * collection.
      */
-    private String closeMethod = "close";
+    private String closeMethod = null;
     
     public String getCloseMethod() {
         return closeMethod;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9af035c4d..71dbc5430 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,7 +117,9 @@
       </fix>
       <add>
         Provide a configuration option that lets the close method to be used for
-        a JNDI Resource to be defined by the user. (markt)
+        a JNDI Resource to be defined by the user. This change also disables
+        using the close method unless one is explicitly defined for the
+        resource. (markt)
       </add>
       <fix>
         Correctly track changes to context.xml files and trigger redeployment
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 863af407a..e8a52102d 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1016,8 +1016,8 @@
       <attribute name="closeMethod" required="false">
         <p>Name of zero-argument method to call on the resource when it is no
         longer required to speed up clean-up of resources that would otherwise
-        happen as part of garbage collection. If not specificed, the default
-        value of <code>close</code> is used.</p>
+        happen as part of garbage collection. If not specificed, no default is
+        defined and no close method will be called.</p>
       </attribute>
 
       <attribute name="description" required="false">
-- 
2.11.0