Author: norman
Date: Fri Apr 30 13:45:42 2010
New Revision: 939673

URL: http://svn.apache.org/viewvc?rev=939673&view=rev
Log:
Close entitymanager after using it

Modified:
    
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailbox.java

Modified: 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailbox.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailbox.java?rev=939673&r1=939672&r2=939673&view=diff
==============================================================================
--- 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailbox.java
 (original)
+++ 
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailbox.java
 Fri Apr 30 13:45:42 2010
@@ -98,22 +98,18 @@ public class OpenJPAMailbox extends JPAM
      */
     protected Mailbox<Long> reserveNextUid(MailboxSession session) throws 
MailboxException {
         OpenJPAEntityManager oem = 
OpenJPAPersistence.cast(entityManagerFactory.createEntityManager());
-        boolean optimistic = oem.getOptimistic();
-        try {
-
-            oem.setOptimistic(false);
-            EntityTransaction transaction = oem.getTransaction();
-            transaction.begin();
-            Query query = 
oem.createNamedQuery("findMailboxById").setParameter("idParam", getMailboxId());
-            org.apache.james.imap.jpa.mail.model.JPAMailbox mailbox = 
(org.apache.james.imap.jpa.mail.model.JPAMailbox) query.getSingleResult();
-            mailbox.consumeUid();
-            oem.persist(mailbox);
-            oem.flush();
-            transaction.commit();
-            return mailbox;
-        } finally {
-            oem.setOptimistic(optimistic);
-        }
+        oem.setOptimistic(false);
+        EntityTransaction transaction = oem.getTransaction();
+        transaction.begin();
+        Query query = 
oem.createNamedQuery("findMailboxById").setParameter("idParam", getMailboxId());
+        org.apache.james.imap.jpa.mail.model.JPAMailbox mailbox = 
(org.apache.james.imap.jpa.mail.model.JPAMailbox) query.getSingleResult();
+        mailbox.consumeUid();
+        oem.persist(mailbox);
+        oem.flush();
+        transaction.commit();
+        oem.close();
+        return mailbox;
+     
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to