svn commit: r1630741 - in /aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc: RecoverableDataSource.java internal/ConnectionManagerFactory.java

[gnodet]

Author: gnodet
Date: Fri Oct 10 09:04:30 2014
New Revision: 1630741

URL: http://svn.apache.org/r1630741
Log:
[ARIES-1250] Use local transactions if not specified for non XA DataSource if 
the transaction manager is present

Modified:
    
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java
    
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java

Modified: 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java?rev=1630741&r1=1630740&r2=1630741&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java
 (original)
+++ 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/RecoverableDataSource.java
 Fri Oct 10 09:04:30 2014
@@ -206,7 +206,7 @@ public class RecoverableDataSource imple
         } else if (dataSource instanceof DataSource) {
             mcf = new DataSourceMCFFactory();
             if (transaction == null) {
-                transaction = "none";
+                transaction = transactionManager != null ? "local" : "none";
             }
         } else {
             throw new IllegalArgumentException("dataSource must be of type 
javax.sql.DataSource/XADataSource");

Modified: 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java?rev=1630741&r1=1630740&r2=1630741&view=diff
==============================================================================
--- 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java
 (original)
+++ 
aries/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ConnectionManagerFactory.java
 Fri Oct 10 09:04:30 2014
@@ -80,7 +80,7 @@ public class ConnectionManagerFactory {
         // Apply the default value for property if necessary
         if (transactionSupport == null) {
             // No transaction
-            if (transaction == null || "local".equalsIgnoreCase(transaction)) {
+            if ("local".equalsIgnoreCase(transaction)) {
                 transactionSupport = LocalTransactions.INSTANCE;
             } else if ("none".equalsIgnoreCase(transaction)) {
                 transactionSupport = NoTransactions.INSTANCE;