You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/08/07 07:41:42 UTC

svn commit: r983176 - /geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java

Author: gawor
Date: Sat Aug  7 05:41:41 2010
New Revision: 983176

URL: http://svn.apache.org/viewvc?rev=983176&view=rev
Log:
more jndi lookup fixes

Modified:
    geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java

Modified: geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?rev=983176&r1=983175&r2=983176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java Sat Aug  7 05:41:41 2010
@@ -155,9 +155,7 @@ public final class AppClientContainer im
                 for (Injection injection : injections) {
                     String jndiName = injection.getJndiName();
                     try {
-                        //TODO this may not be correct due to module, app, and global jndi names.
-                        //our componentContext is attached to jndi at "java:" so we remove that when looking stuff up in it
-                        Object object = componentContext.lookup("comp/env/" + jndiName);
+                        Object object = componentContext.lookup(jndiName);
                         objectRecipe.setProperty(injection.getTargetName(), object);
                     } catch (NamingException e) {
                         log.info("Injection problem for jndiName: " + jndiName, e);