Author: dain
Date: Thu May 31 20:18:08 2007
New Revision: 543376
URL: http://svn.apache.org/viewvc?view=rev&rev=543376
Log:
Add dumm env entry for xbean naming when env is empty
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=543376&r1=543375&r2=543376
==============================================================================
---
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
Thu May 31 20:18:08 2007
@@ -316,7 +316,16 @@
return bindings;
}
- private WritableContext createXBeanWritableContext(Map bindings) {
+ private WritableContext createXBeanWritableContext(Map<String, Object>
bindings) {
+ boolean hasEnv = false;
+ for (String name : bindings.keySet()) {
+ if (name.startsWith("java:comp/env")) {
+ hasEnv = true;
+ break;
+ }
+ }
+ if (!hasEnv) bindings.put("java:comp/env/dummy", "dummy");
+
WritableContext context = null;
try {
context = new WritableContext("", bindings);