If possible, eliminate the NonTxEmCloser by closing the EM immediately after each EM invocation ----------------------------------------------------------------------------------------------- Key: WFLY-441 URL: https://issues.jboss.org/browse/WFLY-441 Project: WildFly Issue Type: Task Components: JPA / Hibernate Reporter: Scott Marlow Priority: Minor Fix For: 8.0.0.CR1 For Queries, handoff the EntityManager to a Query object wrapper and have the Query object finalizer close the EntityManager. Make sure that we respect JPA 2.0 section 3.8.6 (detach objects returned from Query object). 1. Methods that return a Query, will hand off the EM to the Query object wrapper. 2. Other methods will close the EM at the end of the EM method invocation. When making this change, make sure that performance doesn't degrade. The cost of this change, will be that each (transaction scoped non-tx) EM invocation will create a new persistence context, but we can eliminate the NonTxEmCloser which has its own overhead.