Author: lresende
Date: Wed Mar 3 23:21:03 2010
New Revision: 918763
URL: http://svn.apache.org/viewvc?rev=918763&view=rev
Log:
TUSCANY-3477 - Tyding up defaults in the transaction invoker to address test
case failures with IncompatibleIntentException
Modified:
tuscany/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
Modified:
tuscany/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java?rev=918763&r1=918762&r2=918763&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
Wed Mar 3 23:21:03 2010
@@ -26,13 +26,11 @@
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import customer.Customer;
import customer.CustomerRegistry;
-...@ignore
public class CustomerTestCase {
private static Node node;
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java?rev=918763&r1=918762&r2=918763&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
Wed Mar 3 23:21:03 2010
@@ -76,15 +76,24 @@
if (msg.getOperation().isNonBlocking()) {
}
- TransactionIntent interactionIntent =
TransactionIntent.propagatesTransacton;
+
+ // initialize default values
+ TransactionIntent interactionIntent = null;
//TransactionIntent.propagatesTransacton;
+ TransactionIntent implementationIntent =
TransactionIntent.managedTransactionGlobal;
+
if (interactionPolicy != null) {
if (interactionPolicy.getAction() ==
TransactionPolicy.Action.PROPAGATE) {
interactionIntent = TransactionIntent.propagatesTransacton;
+ } else if (interactionPolicy.getAction() ==
TransactionPolicy.Action.REQUIRE_NONE) {
+ interactionIntent = TransactionIntent.suspendsTransaction;
+ if(implementationPolicy == null) {
+ implementationIntent =
TransactionIntent.noManagedTransaction;
+ }
} else {
interactionIntent = TransactionIntent.suspendsTransaction;
}
}
- TransactionIntent implementationIntent =
TransactionIntent.managedTransactionGlobal;
+
if (implementationPolicy != null) {
switch (implementationPolicy.getAction()) {
case REQUIRE_GLOBAL:
