You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/10 11:16:41 UTC
svn commit: r1212758 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
Author: rmannibucau
Date: Sat Dec 10 10:16:41 2011
New Revision: 1212758
URL: http://svn.apache.org/viewvc?rev=1212758&view=rev
Log:
this doesn't work when injection are done with qualified names which is normal so keep the error
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java?rev=1212758&r1=1212757&r2=1212758&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java Sat Dec 10 10:16:41 2011
@@ -57,10 +57,6 @@ public class IvmJndiFactory implements J
Object value = entry.getValue();
if (value == null) continue;
- if (containsParent(bindings, name)) {
- continue; // TODO: find a good solution since this one is ugly and not fully working
- }
-
try {
context.bind(name, value);
} catch (javax.naming.NamingException e) {
@@ -71,18 +67,6 @@ public class IvmJndiFactory implements J
return context;
}
- private static boolean containsParent(Map<String, Object> bindings, String name) {
- String workStr = name;
- if (workStr.startsWith("/")) {
- workStr = workStr.substring(1);
- }
- int index = workStr.lastIndexOf("/");
- if (index > 0) {
- workStr = workStr.substring(0, index);
- }
- return bindings.containsKey(workStr);
- }
-
public Context createRootContext() {
return jndiRootContext;
}