geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r514194 - in /geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound: ./ connectionmanagerconfig/
Date Sat, 03 Mar 2007 17:17:32 GMT
Author: jbohn
Date: Sat Mar  3 09:17:31 2007
New Revision: 514194

URL: http://svn.apache.org/viewvc?view=rev&rev=514194
Log:
revert 511313 to get some tck tests passing again

Modified:
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java
    geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
Sat Mar  3 09:17:31 2007
@@ -88,17 +88,13 @@
 
     public ConnectionManagerContainer.ReturnableXAResource getRecoveryXAResource(ManagedConnectionFactory
managedConnectionFactory) throws ResourceException {
         ManagedConnectionInfo mci = new ManagedConnectionInfo(managedConnectionFactory, null);
-
-        // if no recovery stack, then this isn't a recoverable resource.
-        if (getRecoveryStack() == null) {
+        NamedXAResource namedXAResource = (NamedXAResource) mci.getXAResource();
+        if (namedXAResource == null) {
+            //obviously, we can't do recovery.
             return null;
         }
-        
         ConnectionInfo recoveryConnectionInfo = new ConnectionInfo(mci);
         getRecoveryStack().getConnection(recoveryConnectionInfo);
-
-        NamedXAResource namedXAResource = (NamedXAResource) mci.getXAResource();
-        getRecoveryStack().returnConnection(recoveryConnectionInfo, ConnectionReturnAction.DESTROY);
         return new ConnectionManagerContainer.ReturnableXAResource(namedXAResource, getRecoveryStack(),
recoveryConnectionInfo);
     }
 

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
Sat Mar  3 09:17:31 2007
@@ -98,13 +98,9 @@
                 stack = new SubjectInterceptor(stack);
             }
 
-            // Only create a recovery stack, if the resource is recoverable.
-            if (transactionSupport.isRecoverable()) {
-                this.recoveryStack = new TCCLInterceptor(stack, classLoader);
-            }
-            else {
-                this.recoveryStack = null;
-            }
+            ConnectionInterceptor recoveryStack = stack;
+            this.recoveryStack = new TCCLInterceptor(recoveryStack, classLoader);
+
 
             stack = new ConnectionHandleInterceptor(stack);
             stack = new TCCLInterceptor(stack, classLoader);

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
Sat Mar  3 09:17:31 2007
@@ -44,8 +44,4 @@
         stack = new TransactionEnlistingInterceptor(stack, transactionManager);
         return new TransactionCachingInterceptor(stack, transactionManager);
     }
-    
-    public boolean isRecoverable() {
-        return false;
-    }
 }

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java
Sat Mar  3 09:17:31 2007
@@ -40,8 +40,4 @@
     public ConnectionInterceptor addTransactionInterceptors(ConnectionInterceptor stack,
TransactionManager transactionManager) {
         return stack;
     }
-    
-    public boolean isRecoverable() {
-        return false;
-    }
 }

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
Sat Mar  3 09:17:31 2007
@@ -45,8 +45,4 @@
         stack = new TransactionEnlistingInterceptor(stack, transactionManager);
         return new TransactionCachingInterceptor(stack, transactionManager);
     }
-    
-    public boolean isRecoverable() {
-        return false;
-    }
 }

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java
Sat Mar  3 09:17:31 2007
@@ -32,5 +32,5 @@
 public abstract class TransactionSupport implements Serializable {
     public abstract ConnectionInterceptor addXAResourceInsertionInterceptor(ConnectionInterceptor
stack, String name);
     public abstract ConnectionInterceptor addTransactionInterceptors(ConnectionInterceptor
stack, TransactionManager transactionManager);
-    public abstract boolean isRecoverable();
+
 }

Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java?view=diff&rev=514194&r1=514193&r2=514194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java
Sat Mar  3 09:17:31 2007
@@ -32,7 +32,6 @@
  *
  * */
 public class XATransactions extends TransactionSupport {
-    
     private boolean useTransactionCaching;
     private boolean useThreadCaching;
 
@@ -72,9 +71,5 @@
             stack = new TransactionCachingInterceptor(stack, transactionManager);
         }
         return stack;
-    }
-    
-    public boolean isRecoverable() {
-        return true;
     }
 }



Mime
View raw message