[jboss-cvs] JBossAS SVN: r75832 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/ejb.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2008-07-15 04:41:55 -0400 (Tue, 15 Jul 2008)
New Revision: 75832

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/ejb/JDBCStatementTestsConnectionSessionBean.java
Log:
[JBAS-5770] fix 3 org.jboss.test.jca.test.JDBCStatementTestsConnectionUnitTestCase failures

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/ejb/JDBCStatementTestsConnectionSessionBean.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/ejb/JDBCStatementTestsConnectionSessionBean.java	2008-07-15 07:48:10 UTC (rev 75831)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jca/ejb/JDBCStatementTestsConnectionSessionBean.java	2008-07-15 08:41:55 UTC (rev 75832)
@@ -24,6 +24,8 @@
 import javax.ejb.SessionBean;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
+
+import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -84,7 +86,7 @@
          Connection c = ds.getConnection();
          WrappedConnection wc = (WrappedConnection) c;
          Connection uc = wc.getUnderlyingConnection();
-         tc = (TestConnection) uc;
+         tc = (TestConnection) Proxy.getInvocationHandler(uc);
          c.close();
          tc.setFail(true);
          int closeCount1 = tc.getClosedCount();
@@ -117,7 +119,8 @@
       }
       finally
       {
-         tc.setFail(false);
+         if (tc != null)
+            tc.setFail(false);
       }
    }
 
@@ -286,7 +289,7 @@
             c.setAutoCommit(false);
             WrappedConnection wc = (WrappedConnection) c;
             Connection uc = wc.getUnderlyingConnection();
-            tc = (TestConnection) uc;
+            tc = (TestConnection) Proxy.getInvocationHandler(uc);
 
             try
             {
@@ -333,7 +336,7 @@
          {
             WrappedConnection wc = (WrappedConnection) c;
             Connection uc = wc.getUnderlyingConnection();
-            tc = (TestConnection) uc;
+            tc = (TestConnection) Proxy.getInvocationHandler(uc);
 
             try
             {