From 1e3bf9abff22fd6ed0e979d7083ce70bdb8692e6 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 23 Dec 2009 16:40:47 +0000
Subject: [PATCH] Fix how we detect what class is being invoked so we can
 multiplex the method invocation correctly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@893570 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/jdbc-pool/.classpath                                           | 3 +--
 modules/jdbc-pool/build.properties.default                             | 2 +-
 .../jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/jdbc-pool/.classpath b/modules/jdbc-pool/.classpath
index 575cb2bfb..c82296bfc 100644
--- a/modules/jdbc-pool/.classpath
+++ b/modules/jdbc-pool/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/tomcat-dbcp.jar" sourcepath="/TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/development/tomcat/trunk/trunk/modules/jdbc-pool/includes/h2/bin/h2-1.1.115.jar"/>
-	<classpathentry kind="lib" path="/development/tomcat/trunk/trunk/modules/jdbc-pool/includes/mysql-connector-java-5.1.7-bin.jar"/>
+	<classpathentry kind="lib" path="/development/tomcat/trunk/trunk/modules/jdbc-pool/includes/h2/bin/h2-1.1.118.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default
index 95a9f99bd..2518c547e 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=
+version.patch=.1
 version.suffix=
 
 # ----- Default Base Path for Dependent Packages -----
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
index 503b7d941..cb0edd49c 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
@@ -97,7 +97,7 @@ public class ProxyConnection extends JdbcInterceptor {
             return this.toString();
         } else if (compare(GETCONNECTION_VAL,method) && connection!=null) {
             return connection.getConnection();
-        } else if (method.getClass().equals(XAConnection.class)) {
+        } else if (method.getDeclaringClass().equals(XAConnection.class)) {
             try {
                 return method.invoke(connection.getXAConnection(),args);
             }catch (Throwable t) {
-- 
2.11.0