svn commit: r1525901 - in /tomee/tomee/trunk/container/openejb-core/src: main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java

[rmannibucau]

Author: rmannibucau
Date: Tue Sep 24 14:38:30 2013
New Revision: 1525901

URL: http://svn.apache.org/r1525901
Log:
TOMEE-1044 using equals instead of == to compare transactions

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
    
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java?rev=1525901&r1=1525900&r2=1525901&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
 Tue Sep 24 14:38:30 2013
@@ -82,7 +82,7 @@ public class ManagedConnection implement
             // if we have a tx check it is the same this connection is linked 
to
             if (currentTransaction != null) {
                 if (isUnderTransaction(currentTransaction.getStatus())) {
-                    if (currentTransaction != transaction) {
+                    if (!currentTransaction.equals(transaction)) {
                         throw new SQLException("Connection can not be used 
while enlisted in another transaction");
                     }
                     return invokeUnderTransaction(delegate, method, args);

Modified: 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java?rev=1525901&r1=1525900&r2=1525901&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XADataSourceTest.java
 Tue Sep 24 14:38:30 2013
@@ -22,6 +22,8 @@ import org.apache.openejb.jee.jpa.unit.P
 import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
 import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.loader.Files;
+import org.apache.openejb.resource.jdbc.dbcp.DbcpDataSourceCreator;
+import org.apache.openejb.resource.jdbc.pool.DataSourceCreator;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.Module;
 import org.hsqldb.jdbc.pool.JDBCXADataSource;
@@ -67,7 +69,7 @@ public class XADataSourceTest {
         }
 
         final Properties p = new Properties();
-        p.put("openejb.jdbc.log", "dbcp-alternative");
+        p.put(DataSourceCreator.class.getName(), 
DbcpDataSourceCreator.class.getName());
 
         p.put("txMgr", "new://TransactionManager?type=TransactionManager");
         p.put("txMgr.txRecovery", "true");