Merge branch '2.3' of git@github.com:demoiselle/framework.git into 2.3

Luciano Borges
2 parents 5023f969 05438e72
Showing 2 changed files with 15 additions and 1 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfo.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java
@@ -47,7 +47,16 @@ public class TransactionInfo implements Serializable {
 	private int counter = 0;
-	private boolean owner = false;
+	private boolean owner;
+
+	public TransactionInfo() {
+		clear();
+	}
+
+	public void clear() {
+		this.owner = false;
+		this.counter = 0;
+	}
 	public int getCounter() {
 		return counter;
@@ -167,9 +167,14 @@ public class TransactionalInterceptor implements Serializable {
 			if (transactionInfo.isOwner()) {
 				if (transaction.isMarkedRollback()) {
 					transaction.rollback();
+					transactionInfo.clear();
+
 					getLogger().info(getBundle().getString("transaction-rolledback"));
+
 				} else {
 					transaction.commit();
+					transactionInfo.clear();
+
 					getLogger().info(getBundle().getString("transaction-commited"));
 				}
 			}
	@@ -47,7 +47,16 @@ public class TransactionInfo implements Serializable {		@@ -47,7 +47,16 @@ public class TransactionInfo implements Serializable {
47		47
48	private int counter = 0;	48	private int counter = 0;
49		49
50	- private boolean owner = false;	50	+ private boolean owner;
		51	+
		52	+ public TransactionInfo() {
		53	+ clear();
		54	+ }
		55	+
		56	+ public void clear() {
		57	+ this.owner = false;
		58	+ this.counter = 0;
		59	+ }
51		60
52	public int getCounter() {	61	public int getCounter() {
53	return counter;	62	return counter;