Please remove me from Mailing List, Thanks in advance !!!
M Khurram
The only way to contorl or finish successfully "Think before it will happen,
as when it will be happening you will not have time to Think"
From: [EMAIL PROTECTED]
Reply-To: [email protected]
To: [email protected]
Subject: svn commit: r520971 -
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
Date: Wed, 21 Mar 2007 19:00:27 -0000
Author: rickmcguire
Date: Wed Mar 21 12:00:25 2007
New Revision: 520971
URL: http://svn.apache.org/viewvc?view=rev&rev=520971
Log:
OPENEJB-549 JndiEncBuilder is inserting bad comp/ORB and
comp/HandleDelegate references into jndi tree.
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=520971&r1=520970&r2=520971
==============================================================================
---
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
(original)
+++
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
Wed Mar 21 12:00:25 2007
@@ -24,6 +24,7 @@
import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
import org.apache.openejb.core.ivm.naming.JndiReference;
+import org.apache.openejb.core.ivm.naming.ObjectReference;
import org.apache.openejb.core.ivm.naming.PersistenceUnitReference;
import org.apache.openejb.core.ivm.naming.Reference;
import org.apache.openejb.core.ivm.naming.PersistenceContextReference;
@@ -156,9 +157,13 @@
TransactionSynchronizationRegistry synchronizationRegistry =
SystemInstance.get().getComponent(TransactionSynchronizationRegistry.class);
bindings.put("java:comp/TransactionSynchronizationRegistry",
synchronizationRegistry);
+
+ ORB orb = SystemInstance.get().getComponent(ORB.class);
// bind CORBA stuff
- bindings.put("java:comp/ORB", new
SystemComponentReference(ORB.class));
- bindings.put("java:comp/HandleDelegate", new
SystemComponentReference(HandleDelegate.class));
+ if (orb != null) {
+ bindings.put("java:comp/ORB", new ObjectReference(orb));
+ bindings.put("java:comp/HandleDelegate", new
ObjectReference(SystemInstance.get().getComponent(ORB.class)));
+ }
// get JtaEntityManagerRegistry
JtaEntityManagerRegistry jtaEntityManagerRegistry =
SystemInstance.get().getComponent(JtaEntityManagerRegistry.class);
_________________________________________________________________
Don't just search. Find. Check out the new MSN Search!
http://search.msn.click-url.com/go/onm00200636ave/direct/01/
