Author: fhanik
Date: Fri Nov 13 20:12:32 2009
New Revision: 835974
URL: http://svn.apache.org/viewvc?rev=835974&view=rev
Log:
Use a safe default of the useEquals, works on any VM.
Modified:
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=835974&r1=835973&r2=835974&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri Nov 13 20:12:32 2009
@@ -383,9 +383,9 @@
</attribute>
<attribute name="useEquals" required="false">
- <p>(boolean) Set to true if you wish the <code>ProxyConnection</code>
class to use <code>String.equals</code> instead of
- <code>==</code> when comparing method names. This property does not
apply to added interceptors as those are configured individually.
- The default value is <code>false</code>.
+ <p>(boolean) Set to true if you wish the <code>ProxyConnection</code>
class to use <code>String.equals</code> and set to <code>false</code>
+ when you wish to use <code>==</code> when comparing method names.
This property does not apply to added interceptors as those are configured
individually.
+ The default value is <code>true</code>.
</p>
</attribute>
</attributes>
@@ -426,9 +426,9 @@
<p>Abstract base class for all interceptors, can not be instantiated.</p>
<attributes>
<attribute name="useEquals" required="false">
- <p>(String as boolean) Set to true if you wish the interceptor class
to use <code>String.equals</code> instead of
- <code>==</code> when comparing method names. This property does not
apply to added interceptors as those are configured individually.
- The default value is <code>false</code>.
+ <p>(boolean) Set to true if you wish the <code>ProxyConnection</code>
class to use <code>String.equals</code> and set to <code>false</code>
+ when you wish to use <code>==</code> when comparing method names.
+ The default value is <code>true</code>.
</p>
</attribute>
</attributes>
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=835974&r1=835973&r2=835974&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
Fri Nov 13 20:12:32 2009
@@ -65,7 +65,7 @@
/**
* Property that decides how we do string comparison, default is reference
(==)
*/
- private boolean useEquals = false;
+ private boolean useEquals = true;
/**
* Public constructor for instantation through reflection
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=835974&r1=835973&r2=835974&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Fri Nov 13 20:12:32 2009
@@ -69,7 +69,7 @@
protected boolean testOnConnect =false;
protected String jdbcInterceptors=null;
protected boolean fairQueue = true;
- protected boolean useEquals = false;
+ protected boolean useEquals = true;
protected int abandonWhenPercentageFull = 0;
protected long maxAge = 0;
protected boolean useLock = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
