archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TUSCANY-3477 - Tyding up defaults in the transaction invoker to address test case failures with IncompatibleIntentException

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@918763 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
lresende 2010-03-03 23:21:03 +00:00
commit 2e5c11e6a9
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
View file

@ -26,13 +26,11 @@ import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import customer.Customer; import customer.Customer;
import customer.CustomerRegistry; import customer.CustomerRegistry;
@Ignore
public class CustomerTestCase { public class CustomerTestCase {
private static Node node; private static Node node;

13
sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
View file

@ -76,15 +76,24 @@ public class TransactionInterceptor implements PhasedInterceptor {
if (msg.getOperation().isNonBlocking()) { 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 != null) {
if (interactionPolicy.getAction() == TransactionPolicy.Action.PROPAGATE) { if (interactionPolicy.getAction() == TransactionPolicy.Action.PROPAGATE) {
interactionIntent = TransactionIntent.propagatesTransacton; interactionIntent = TransactionIntent.propagatesTransacton;
} else if (interactionPolicy.getAction() == TransactionPolicy.Action.REQUIRE_NONE) {
interactionIntent = TransactionIntent.suspendsTransaction;
if(implementationPolicy == null) {
implementationIntent = TransactionIntent.noManagedTransaction;
}
} else { } else {
interactionIntent = TransactionIntent.suspendsTransaction; interactionIntent = TransactionIntent.suspendsTransaction;
} }
} }
TransactionIntent implementationIntent = TransactionIntent.managedTransactionGlobal;
if (implementationPolicy != null) { if (implementationPolicy != null) {
switch (implementationPolicy.getAction()) { switch (implementationPolicy.getAction()) {
case REQUIRE_GLOBAL: case REQUIRE_GLOBAL: