cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction UserTransactionImpl.java

[dain]

dain        2004/04/07 16:38:18

  Modified:    modules/transaction/src/java/org/apache/geronimo/transaction
                        UserTransactionImpl.java
  Log:
  Removed requirement that tracked connection associater not be null; in
  openejb the tracked connection associater will be null for legacy clients
  
  Revision  Changes    Path
  1.3       +8 -5      
incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/UserTransactionImpl.java
  
  Index: UserTransactionImpl.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/UserTransactionImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserTransactionImpl.java  6 Apr 2004 18:33:36 -0000       1.2
  +++ UserTransactionImpl.java  7 Apr 2004 23:38:18 -0000       1.3
  @@ -131,10 +131,13 @@
                   throw e;
               }
               TransactionContext.setContext(newContext);
  -            try {
  -                trackedConnectionAssociator.newTransaction();
  -            } catch (ResourceException e) {
  -                throw (SystemException)new SystemException().initCause(e);
  +
  +            if(trackedConnectionAssociator != null) {
  +                try {
  +                    trackedConnectionAssociator.newTransaction();
  +                } catch (ResourceException e) {
  +                    throw (SystemException)new 
SystemException().initCause(e);
  +                }
               }
           }