svn commit: r948272 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

[djencks]

Author: djencks
Date: Wed May 26 00:29:21 2010
New Revision: 948272

URL: http://svn.apache.org/viewvc?rev=948272&view=rev
Log:
jndi entry type may be inferred from injection targets, so don't ever fill it 
in if not supplied

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=948272&r1=948271&r2=948272&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 Wed May 26 00:29:21 2010
@@ -355,16 +355,19 @@ public class JndiEncInfoBuilder {
             if (env.getEnvEntryValue() == null) {
                 continue;
             }
-
-            if (env.getEnvEntryType() == null){
-                // TODO: Maybe Move this into the EnvEntry class
-                env.setEnvEntryType("java.lang.String");
-            }
+              //TODO this is wrong, need to infer type from injections.
+//            if (env.getEnvEntryType() == null){
+//                // TODO: Maybe Move this into the EnvEntry class
+//                env.setEnvEntryType("java.lang.String");
+//            }
             
             EnvEntryInfo info = new EnvEntryInfo();
 
             info.name = env.getEnvEntryName();
             info.type = env.getEnvEntryType();
+            if (info.type == null) {
+                info.type = "java.lang.String";
+            }
             info.value = env.getEnvEntryValue();
             info.location = buildLocationInfo(env);
             info.targets.addAll(buildInjectionInfos(env));