Author: djencks
Date: Tue Apr 20 22:16:53 2010
New Revision: 936089
URL: http://svn.apache.org/viewvc?rev=936089&view=rev
Log:
OPENEJB-1259 Temporary fallback lookup for cmp jpa persistence context
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=936089&r1=936088&r2=936089&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
Tue Apr 20 22:16:53 2010
@@ -28,6 +28,7 @@ import javax.ejb.EJBObject;
import javax.ejb.EntityBean;
import javax.ejb.FinderException;
import javax.ejb.RemoveException;
+import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
@@ -91,7 +92,13 @@ public class JpaCmpEngine implements Cmp
EntityManager entityManager = null;
try {
entityManager = (EntityManager)
deploymentInfo.getJndiEnc().lookup("java:comp/env/" +
CMP_PERSISTENCE_CONTEXT_REF_NAME);
- } catch (NamingException ignroed) {
+ } catch (NamingException ignored) {
+ //TODO see OPENEJB-1259 temporary hack until geronimo jndi
integration works better
+ try {
+ entityManager = (EntityManager) new
InitialContext().lookup("java:comp/env/" + CMP_PERSISTENCE_CONTEXT_REF_NAME);
+ } catch (NamingException ignored2) {
+ //ignore
+ }
}
if (entityManager == null) {
