Author: markt
Date: Thu Mar 31 13:02:20 2011
New Revision: 1087286
URL: http://svn.apache.org/viewvc?rev=1087286&view=rev
Log:
Feedback on https://issues.apache.org/bugzilla/show_bug.cgi?id=50991
Change the default
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java?rev=1087286&r1=1087285&r2=1087286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextResource.java Thu Mar
31 13:02:20 2011
@@ -87,7 +87,7 @@ public class ContextResource extends Res
* 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;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1087286&r1=1087285&r2=1087286&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 31 13:02:20 2011
@@ -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
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1087286&r1=1087285&r2=1087286&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Thu Mar 31 13:02:20 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
