From e386cfd7fc123ba7d564594c7f3d6c6f3230e34a Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Fri, 15 Mar 2013 14:33:11 -0300
Subject: [PATCH] Correção no erro de injeção após as modificações

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/template/DelegateCrud.java                |  6 +++++-
 impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionInfo.java          | 44 ++++++++++++++++++++++++++++++++++++++++++++
 impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java | 40 ----------------------------------------
 3 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionInfo.java

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/template/DelegateCrud.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/template/DelegateCrud.java
index 2be35b6..2c55dd8 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/template/DelegateCrud.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/template/DelegateCrud.java
@@ -41,6 +41,7 @@ import java.util.ListIterator;
 
 import br.gov.frameworkdemoiselle.internal.implementation.DefaultTransaction;
 import br.gov.frameworkdemoiselle.transaction.Transaction;
+import br.gov.frameworkdemoiselle.transaction.TransactionContext;
 import br.gov.frameworkdemoiselle.transaction.Transactional;
 import br.gov.frameworkdemoiselle.util.Beans;
 import br.gov.frameworkdemoiselle.util.Reflections;
@@ -142,6 +143,8 @@ public class DelegateCrud<T, I, C extends Crud<T, I>> implements Crud<T, I> {
 		} else {
 			nonTransactionalInsert(bean);
 		}
+		
+		System.out.println();
 	}
 
 	@Transactional
@@ -188,6 +191,7 @@ public class DelegateCrud<T, I, C extends Crud<T, I>> implements Crud<T, I> {
 	}
 
 	private boolean isRunningTransactionalOperations() {
-		return !(Beans.getReference(Transaction.class) instanceof DefaultTransaction);
+		Transaction transaction = Beans.getReference(TransactionContext.class).getCurrentTransaction();
+		return !(transaction instanceof DefaultTransaction);
 	}
 }
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionInfo.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionInfo.java
new file mode 100644
index 0000000..e2a4574
--- /dev/null
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionInfo.java
@@ -0,0 +1,44 @@
+package br.gov.frameworkdemoiselle.transaction;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class TransactionInfo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private int counter = 0;
+
+	private boolean owner;
+
+	public TransactionInfo() {
+		clear();
+	}
+
+	public void clear() {
+		this.owner = false;
+		this.counter = 0;
+	}
+
+	public int getCounter() {
+		return counter;
+	}
+
+	public void incrementCounter() {
+		this.counter++;
+	}
+
+	public void decrementCounter() {
+		this.counter--;
+	}
+
+	public void markAsOwner() {
+		this.owner = true;
+	}
+
+	public boolean isOwner() {
+		return owner;
+	}
+}
diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java
index f50d3fd..302320f 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java
@@ -39,7 +39,6 @@ package br.gov.frameworkdemoiselle.transaction;
 import java.io.Serializable;
 
 import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.RequestScoped;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
@@ -197,43 +196,4 @@ public class TransactionalInterceptor implements Serializable {
 
 		return logger;
 	}
-
-	@RequestScoped
-	class TransactionInfo implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-
-		private int counter = 0;
-
-		private boolean owner;
-
-		public TransactionInfo() {
-			clear();
-		}
-
-		public void clear() {
-			this.owner = false;
-			this.counter = 0;
-		}
-
-		public int getCounter() {
-			return counter;
-		}
-
-		public void incrementCounter() {
-			this.counter++;
-		}
-
-		public void decrementCounter() {
-			this.counter--;
-		}
-
-		public void markAsOwner() {
-			this.owner = true;
-		}
-
-		public boolean isOwner() {
-			return owner;
-		}
-	}
 }
--
libgit2 0.21.2