[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions NoDTxClientTransactionPolicyConfig.java NoDTxServerTransactionPolicies.java Required.java

[djencks]

djencks     2005/04/19 21:47:37

  Modified:    
modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions
                        NoDTxClientTransactionPolicyConfig.java
                        NoDTxServerTransactionPolicies.java Required.java
  Log:

  bug fixes and cleanup of tx interop
  
  Revision  Changes    Path
  1.2       +2 -2      
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxClientTransactionPolicyConfig.java
  
  Index: NoDTxClientTransactionPolicyConfig.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxClientTransactionPolicyConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NoDTxClientTransactionPolicyConfig.java   15 Mar 2005 05:27:06 -0000      
1.1
  +++ NoDTxClientTransactionPolicyConfig.java   20 Apr 2005 01:47:37 -0000      
1.2
  @@ -63,7 +63,7 @@
               PropagationContextHelper.insert(any, propagationContext);
               byte[] encodedPropagationContext;
               try {
  -                encodedPropagationContext = codec.encode(any);
  +                encodedPropagationContext = codec.encode_value(any);
               } catch (InvalidTypeForEncoding invalidTypeForEncoding) {
                   throw (INTERNAL)new INTERNAL("Could not encode 
propagationContext").initCause(invalidTypeForEncoding);
               }
  
  
  
  1.2       +2 -2      
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxServerTransactionPolicies.java
  
  Index: NoDTxServerTransactionPolicies.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/NoDTxServerTransactionPolicies.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NoDTxServerTransactionPolicies.java       15 Mar 2005 05:27:06 -0000      
1.1
  +++ NoDTxServerTransactionPolicies.java       20 Apr 2005 01:47:37 -0000      
1.2
  @@ -28,7 +28,7 @@
           policies[TransactionPolicyType.Mandatory.getIndex()] = 
Required.INSTANCE;
           policies[TransactionPolicyType.Never.getIndex()] = 
NotRequired.INSTANCE;
           policies[TransactionPolicyType.NotSupported.getIndex()] = 
Ignore.INSTANCE;
  -        policies[TransactionPolicyType.Required.getIndex()] = 
Required.INSTANCE;
  +        policies[TransactionPolicyType.Required.getIndex()] = 
NotRequired.INSTANCE;
           policies[TransactionPolicyType.RequiresNew.getIndex()] = 
Ignore.INSTANCE;
           policies[TransactionPolicyType.Supports.getIndex()] = 
NotRequired.INSTANCE;
           policies[TransactionPolicyType.Bean.getIndex()] = Ignore.INSTANCE;
  
  
  
  1.2       +6 -2      
openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Required.java
  
  Index: Required.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/transaction/nodistributedtransactions/Required.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Required.java     15 Mar 2005 05:27:06 -0000      1.1
  +++ Required.java     20 Apr 2005 01:47:37 -0000      1.2
  @@ -21,6 +21,7 @@
   import org.openejb.corba.transaction.OperationTxPolicy;
   import org.openejb.corba.idl.CosTransactions.PropagationContext;
   import org.omg.CORBA.INVALID_TRANSACTION;
  +import org.omg.CORBA.TRANSACTION_REQUIRED;
   
   /**
    * Use for:
  @@ -33,6 +34,9 @@
       public static final OperationTxPolicy INSTANCE = new Required();
       
       public void importTransaction(PropagationContext propagationContext) {
  -        throw new INVALID_TRANSACTION("Transaction cannot be imported"); 
  +        if (propagationContext == null) {
  +            throw new TRANSACTION_REQUIRED("Transaction required");
  +        }
  +        throw new INVALID_TRANSACTION("Transaction cannot be imported");
       }
   }