You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/19 12:52:11 UTC

svn commit: r1172563 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java

Author: dblevins
Date: Mon Sep 19 10:52:11 2011
New Revision: 1172563

URL: http://svn.apache.org/viewvc?rev=1172563&view=rev
Log:
Null check and better check to see if "openejb:" is used

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java?rev=1172563&r1=1172562&r2=1172563&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatJndiBuilder.java Mon Sep 19 10:52:11 2011
@@ -182,14 +182,16 @@ public class TomcatJndiBuilder {
 
         final WebContext webContext = cs.getWebContext(path);
 
-        for (Map.Entry<String, Object> entry : webContext.getBindings().entrySet()) {
-            try {
-                final String key = entry.getKey();
-                Object value = normalize(entry.getValue());
-                mkdirs(root, key);
-                root.rebind(key, value);
-            } catch (NamingException e) {
-                e.printStackTrace();
+        if (webContext != null && webContext.getBindings() != null) {
+            for (Map.Entry<String, Object> entry : webContext.getBindings().entrySet()) {
+                try {
+                    final String key = entry.getKey();
+                    Object value = normalize(entry.getValue());
+                    mkdirs(root, key);
+                    root.rebind(key, value);
+                } catch (NamingException e) {
+                    e.printStackTrace();
+                }
             }
         }
 
@@ -215,6 +217,8 @@ public class TomcatJndiBuilder {
 
             final String address = refAddr.getContent().toString();
 
+            if (address.startsWith("openejb:")) return value;
+
             if (!address.startsWith("java:")) {
                 return new LinkRef("java:" + address);
             }