From: Date: August 29 2007 9:31pm
Subject: Connector/J commit: r6529 - in trunk: . connector-j connector-j/src/com/mysql/jdbc/integration/jboss
List-Archive: http://lists.mysql.com/commits/33387
X-Bug: 29106
Message-Id: <200708291931.l7TJVjx8021853@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/
   trunk/connector-j/CHANGES
   trunk/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java
Log:
Merged revisions 6525-6528 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_0

.......
  r6528 | mmatthews | 2007-08-29 14:27:12 -0500 (Wed, 29 Aug 2007) | 2 lines
  
  Fixed BUG#29106 - Connection checker for JBoss didn't use same method parameters
  
        via reflection, causing connections to always seem "bad".
.......



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6524 /branches/branch_5_1:1-6517
   + /branches/branch_5_0:1-6528 /branches/branch_5_1:1-6517

Modified: trunk/connector-j/CHANGES
===================================================================
--- trunk/connector-j/CHANGES	2007-08-29 19:27:12 UTC (rev 6528)
+++ trunk/connector-j/CHANGES	2007-08-29 19:31:44 UTC (rev 6529)
@@ -196,6 +196,9 @@
                                           specifically to work around dubious metadata 
                                           returned by the server for GROUP BY clauses?
 
+    - Fixed BUG#29106 - Connection checker for JBoss didn't use same method parameters
+      via reflection, causing connections to always seem "bad".
+      
 07-19-07 - Version 5.0.7
 
     - Setting the configuration parameter "useCursorFetch" to "true" for

Modified: trunk/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java	2007-08-29 19:27:12 UTC (rev 6528)
+++ trunk/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java	2007-08-29 19:31:44 UTC (rev 6529)
@@ -77,7 +77,7 @@
 		if (conn instanceof com.mysql.jdbc.Connection) {
 			if (pingMethod != null) {
 				try {
-					this.pingMethod.invoke(conn, NO_ARGS_OBJECT_ARRAY);
+					this.pingMethod.invoke(conn, null);
 	
 					return null;
 				} catch (Exception ex) {
@@ -91,7 +91,7 @@
 		} else if (conn instanceof com.mysql.jdbc.jdbc2.optional.ConnectionWrapper) {
 			if (pingMethodWrapped != null) {
 				try {
-					this.pingMethodWrapped.invoke(conn, NO_ARGS_OBJECT_ARRAY);
+					this.pingMethodWrapped.invoke(conn, null);
 	
 					return null;
 				} catch (Exception ex) {