You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2008/11/24 21:41:39 UTC
svn commit: r720282 - in /tomcat/trunk/modules/jdbc-pool: doc/
java/org/apache/tomcat/jdbc/pool/
java/org/apache/tomcat/jdbc/pool/interceptor/
Author: fhanik
Date: Mon Nov 24 12:41:38 2008
New Revision: 720282
URL: http://svn.apache.org/viewvc?rev=720282&view=rev
Log:
implemented use equals attribute everywhere
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/interceptor/AbstractCreateStatementInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.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=720282&r1=720281&r2=720282&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Mon Nov 24 12:41:38 2008
@@ -328,7 +328,8 @@
<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>
+ </p>
+ </attribute>
</attributes>
</subsection>
</section>
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=720282&r1=720281&r2=720282&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 Mon Nov 24 12:41:38 2008
@@ -56,14 +56,18 @@
this.next = next;
}
- public boolean compare(String methodName, Method method) {
+ public boolean compare(String name1, String name2) {
if (useEquals()) {
- return methodName.equals(method.getName());
+ return name1.equals(name2);
} else {
- return methodName==method.getName();
+ return name1==name2;
}
}
+ public boolean compare(String methodName, Method method) {
+ return compare(methodName, method.getName());
+ }
+
/**
* Gets called each time the connection is borrowed from the pool
* @param parent - the connection pool owning the connection
Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java?rev=720282&r1=720281&r2=720282&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java Mon Nov 24 12:41:38 2008
@@ -40,7 +40,7 @@
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if (CLOSE_VAL==method.getName()) {
+ if (compare(CLOSE_VAL,method)) {
closeInvoked();
return super.invoke(proxy, method, args);
} else {
@@ -70,7 +70,7 @@
protected boolean process(String[] names, Method method, boolean process) {
for (int i=0; (!process) && i<names.length; i++) {
- process = (method.getName()==names[i]);
+ process = compare(names[i],method);
}
return process;
}
Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java?rev=720282&r1=720281&r2=720282&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java Mon Nov 24 12:41:38 2008
@@ -99,12 +99,12 @@
boolean read = false;
int index = -1;
for (int i=0; (!read) && i<readState.length; i++) {
- read = name==readState[i];
+ read = compare(name,readState[i]);
if (read) index = i;
}
boolean write = false;
for (int i=0; (!write) && (!read) && i<writeState.length; i++) {
- write = name==writeState[i];
+ write = compare(name,writeState[i]);
if (write) index = i;
}
Object result = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org