You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2013/01/30 23:47:53 UTC
svn commit: r1440724 - in
/myfaces/extensions/cdi/trunk/jee-modules/jpa-module:
api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/
impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/
impl/src/main/java/org/apache/myface...
Author: struberg
Date: Wed Jan 30 22:47:53 2013
New Revision: 1440724
URL: http://svn.apache.org/viewvc?rev=1440724&view=rev
Log:
EXTCDI-305 do qualifier check only for EntityManagers
Other beans can have any Qualifier.
This commit also fixes the ending of the TransactionContext to allow using
fresh transactions in a @PreDestroy of @TransactionScoped beans.
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/context/TransactionContext.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java?rev=1440724&r1=1440723&r2=1440724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java Wed Jan 30 22:47:53 2013
@@ -34,8 +34,6 @@ import java.lang.annotation.Annotation;
* The optional qualifier can be used to specify different entity managers.
*/
-//TODO instead of using #qualifier it should be possible to use a custom qualifier annotated with @TransactionQualifier
-
@InterceptorBinding
@Documented
@Inherited
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java?rev=1440724&r1=1440723&r2=1440724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java Wed Jan 30 22:47:53 2013
@@ -136,33 +136,23 @@ public class TransactionalInterceptorStr
for (Map.Entry<String, EntityManager> emsEntry: emsEntries.entrySet())
{
EntityManager em = emsEntry.getValue();
-
- try
+ transaction = em.getTransaction();
+ if (transaction != null && transaction.isActive())
{
- transaction = em.getTransaction();
-
- if (transaction != null && transaction.isActive())
+ try
{
- try
- {
- transaction.rollback();
- }
- catch (Exception eRollback)
+ transaction.rollback();
+ }
+ catch (Exception eRollback)
+ {
+ if(LOGGER.isLoggable(Level.SEVERE))
{
- if(LOGGER.isLoggable(Level.SEVERE))
- {
- LOGGER.log(Level.SEVERE,
- "Got additional Exception while subsequently " +
- "rolling back other SQL transactions", eRollback);
- }
+ LOGGER.log(Level.SEVERE,
+ "Got additional Exception while subsequently " +
+ "rolling back other SQL transactions", eRollback);
}
}
}
- catch (IllegalStateException e2)
- {
- //just happens if the setup is wrong -> we can't do a proper cleanup
- //but we have to continue to cleanup the scope
- }
}
// drop all EntityManagers from the ThreadLocal
@@ -240,15 +230,18 @@ public class TransactionalInterceptorStr
}
}
+ ems.remove();
+ ems.set(null);
+
+ refCounterMaps.set(null);
+ refCounterMaps.remove();
+
// and now we close all open transactionscopes and reset the storage
- TransactionBeanStorage.getStorage().endAllTransactionScopes();
- TransactionBeanStorage.resetStorage();
- }
- else
- {
- //just happens if the wrong qualifier is used in an application
- TransactionBeanStorage.getStorage().endAllTransactionScopes();
+ TransactionBeanStorage oldStorage = TransactionBeanStorage.getStorage();
TransactionBeanStorage.resetStorage();
+
+ // we do this delayed to allow new transactions in a PreDestroy method
+ oldStorage.endAllTransactionScopes();
}
}
else
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/context/TransactionContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/context/TransactionContext.java?rev=1440724&r1=1440723&r2=1440724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/context/TransactionContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/context/TransactionContext.java Wed Jan 30 22:47:53 2013
@@ -27,6 +27,7 @@ import javax.enterprise.context.spi.Cont
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Typed;
+import javax.persistence.EntityManager;
import java.lang.annotation.Annotation;
import java.util.Map;
@@ -88,6 +89,14 @@ public class TransactionContext implemen
private void checkTransactionBeanEntry(TransactionBeanEntry<?> transactionBeanEntry)
{
+ if (! (transactionBeanEntry.getContextualInstance() instanceof EntityManager))
+ {
+ return;
+ }
+
+ // we only do this special check for EntityManagers
+ // this detects the problem when someone uses a @Transactional(SomeQualifier.class)
+ // while using an @Inject @AnotherQualifier EntityManager em; ...
String activeTransactionKey = TransactionBeanStorage.getStorage().getActiveTransactionKey();
for(Annotation qualifier : transactionBeanEntry.getQualifiers())