geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r507194 - /geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
Date Tue, 13 Feb 2007 20:22:57 GMT
Author: djencks
Date: Tue Feb 13 12:22:56 2007
New Revision: 507194

URL: http://svn.apache.org/viewvc?view=rev&rev=507194
Log:
GERONIMO-2831 install the jndi context at the right mount point

Modified:
    geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java

Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?view=diff&rev=507194&r1=507193&r2=507194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
Tue Feb 13 12:22:56 2007
@@ -62,6 +62,8 @@
 
     private CoreDeploymentInfo deploymentInfo;
 
+    private Context javaCompSubContext;
+
     public EjbDeployment(String objectName,
                          String deploymentId,
                          String ejbName,
@@ -147,7 +149,7 @@
     }
 
     public Context getComponentContext() {
-        return deploymentInfo.getJndiEnc();
+        return javaCompSubContext;
     }
 
     public Set getUnshareableResources() {
@@ -270,8 +272,9 @@
         if (deploymentInfo == null) {
             throw new IllegalStateException("Ejb does not exist " + deploymentId);
         }
+        javaCompSubContext = (Context) deploymentInfo.getJndiEnc().lookup("java:comp");
         if (componentContext != null) {
-            ((Context)deploymentInfo.getJndiEnc().lookup("java:comp")).bind("geronimo", componentContext);
+            javaCompSubContext.bind("geronimo", componentContext);
         }
         deploymentInfo.set(EjbDeployment.class, this);
     }



Mime
View raw message