Connector/J commit: r6530 - in branches/branch_5_1: . connector-j connector-j/src/com/mysql/jdbc/integration/jboss

[mmatthews]

Modified:
   branches/branch_5_1/
   branches/branch_5_1/connector-j/CHANGES
  
branches/branch_5_1/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java
Log:
Merged revisions
6393-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6522,6524,6526-6529
via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/trunk

...............
  r6529 | mmatthews | 2007-08-29 14:31:44 -0500 (Wed, 29 Aug 2007) | 11 lines
  
  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: branches/branch_5_1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-6392,6523-6525
   +
/trunk:1-6396,6398-6402,6405-6407,6414-6473,6475,6477,6480,6483-6486,6489-6492,6496-6500,6509-6511,6513,6517-6518,6521-6529

Modified: branches/branch_5_1/connector-j/CHANGES
===================================================================
--- branches/branch_5_1/connector-j/CHANGES	2007-08-29 19:31:44 UTC (rev 6529)
+++ branches/branch_5_1/connector-j/CHANGES	2007-08-29 19:42:13 UTC (rev 6530)
@@ -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:
branches/branch_5_1/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java
===================================================================
---
branches/branch_5_1/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java	2007-08-29
19:31:44 UTC (rev 6529)
+++
branches/branch_5_1/connector-j/src/com/mysql/jdbc/integration/jboss/MysqlValidConnectionChecker.java	2007-08-29
19:42:13 UTC (rev 6530)
@@ -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) {