geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager UserTransactionImpl.java
Date Fri, 23 Jan 2004 19:06:56 GMT
dain        2004/01/23 11:06:56

  Modified:    modules/transaction project.xml
               modules/transaction/src/java/org/apache/geronimo/transaction/manager
                        UserTransactionImpl.java
  Log:
  (null)
  
  Revision  Changes    Path
  1.2       +10 -1     incubator-geronimo/modules/transaction/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/transaction/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	23 Jan 2004 18:54:15 -0000	1.1
  +++ project.xml	23 Jan 2004 19:06:56 -0000	1.2
  @@ -30,6 +30,15 @@
   
           <dependency>
               <groupId>geronimo</groupId>
  +            <artifactId>geronimo-connector</artifactId>
  +            <version>DEV</version>
  +            <properties>
  +                <module>true</module>
  +            </properties>
  +        </dependency>
  +
  +        <dependency>
  +            <groupId>geronimo</groupId>
               <artifactId>geronimo-kernel</artifactId>
               <version>DEV</version>
               <properties>
  
  
  
  1.2       +14 -16    incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/UserTransactionImpl.java
  
  Index: UserTransactionImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/manager/UserTransactionImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UserTransactionImpl.java	23 Jan 2004 18:54:16 -0000	1.1
  +++ UserTransactionImpl.java	23 Jan 2004 19:06:56 -0000	1.2
  @@ -56,7 +56,6 @@
   package org.apache.geronimo.transaction.manager;
   
   import java.io.Serializable;
  -
   import javax.transaction.HeuristicMixedException;
   import javax.transaction.HeuristicRollbackException;
   import javax.transaction.NotSupportedException;
  @@ -65,7 +64,7 @@
   import javax.transaction.TransactionManager;
   import javax.transaction.UserTransaction;
   
  -//import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
  +import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
   
   /**
    * TODO this needs to migrate to using TransactionContext.
  @@ -74,9 +73,9 @@
    *
    * @version $Revision$ $Date$
    */
  -public class UserTransactionImpl implements UserTransaction, Serializable{
  +public class UserTransactionImpl implements UserTransaction, Serializable {
       private transient TransactionManager transactionManager;
  -//    private transient TrackedConnectionAssociator trackedConnectionAssociator;
  +    private transient TrackedConnectionAssociator trackedConnectionAssociator;
   
       public UserTransactionImpl() {
       }
  @@ -89,13 +88,13 @@
           this.transactionManager = transactionManager;
       }
   
  -//    public TrackedConnectionAssociator getTrackedConnectionAssociator() {
  -//        return trackedConnectionAssociator;
  -//    }
  -
  -//    public void setTrackedConnectionAssociator(TrackedConnectionAssociator trackedConnectionAssociator)
{
  -//        this.trackedConnectionAssociator = trackedConnectionAssociator;
  -//    }
  +    public TrackedConnectionAssociator getTrackedConnectionAssociator() {
  +        return trackedConnectionAssociator;
  +    }
  +
  +    public void setTrackedConnectionAssociator(TrackedConnectionAssociator trackedConnectionAssociator)
{
  +        this.trackedConnectionAssociator = trackedConnectionAssociator;
  +    }
   
       public void begin() throws NotSupportedException, SystemException {
           checkState();
  @@ -128,9 +127,8 @@
       }
   
       private void checkState() {
  -//        if (transactionManager == null || trackedConnectionAssociator == null) {
  -//            throw new IllegalStateException("UserTransaction is disabled");
  -//        }
  +        if (transactionManager == null || trackedConnectionAssociator == null) {
  +            throw new IllegalStateException("UserTransaction is disabled");
  +        }
       }
  -
   }
  
  
  

Mime
View raw message