Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C1C65200BBB for ; Thu, 10 Nov 2016 18:49:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C094D160B01; Thu, 10 Nov 2016 17:49:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1CE6A160AF7 for ; Thu, 10 Nov 2016 18:49:09 +0100 (CET) Received: (qmail 91970 invoked by uid 500); 10 Nov 2016 17:49:09 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 91961 invoked by uid 99); 10 Nov 2016 17:49:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 17:49:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 21A8FE01F4; Thu, 10 Nov 2016 17:49:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <4611102352af4cd1a965700bba263c93@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: making entity manager thread safe Date: Thu, 10 Nov 2016 17:49:09 +0000 (UTC) archived-at: Thu, 10 Nov 2016 17:49:10 -0000 Repository: airavata Updated Branches: refs/heads/develop 3fa3c3f63 -> 6a73db2fd making entity manager thread safe Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6a73db2f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6a73db2f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6a73db2f Branch: refs/heads/develop Commit: 6a73db2fd29595e62354cb394b755de3cc79ca4b Parents: 3fa3c3f Author: scnakandala Authored: Thu Nov 10 12:49:04 2016 -0500 Committer: scnakandala Committed: Thu Nov 10 12:49:04 2016 -0500 ---------------------------------------------------------------------- .../airavata/sharing/registry/db/utils/JPAUtils.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6a73db2f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java index f879c15..ee0cce4 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java @@ -58,6 +58,11 @@ public class JPAUtils { private static String jdbcUser; private static String jdbcPassword; + private static final ThreadLocal threadLocal; + static { + threadLocal = new ThreadLocal(); + } + @PersistenceUnit(unitName = PERSISTENCE_UNIT_NAME) protected static EntityManagerFactory factory; @@ -96,7 +101,12 @@ public class JPAUtils { properties.put("openjpa.RuntimeUnenhancedClasses", "warn"); factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties); } - entityManager = factory.createEntityManager(); + + entityManager = threadLocal.get(); + if(entityManager == null){ + entityManager = factory.createEntityManager(); + threadLocal.set(entityManager); + } return entityManager; }