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/15 00:42:33 UTC

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

Author: dblevins
Date: Wed Sep 14 22:42:33 2011
New Revision: 1170875

URL: http://svn.apache.org/viewvc?rev=1170875&view=rev
Log:
handle null types in resource-env-ref

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

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBNamingResource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBNamingResource.java?rev=1170875&r1=1170874&r2=1170875&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBNamingResource.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBNamingResource.java Wed Sep 14 22:42:33 2011
@@ -1,6 +1,7 @@
 package org.apache.openejb.tomcat.catalina;
 
 import org.apache.catalina.deploy.ContextEnvironment;
+import org.apache.catalina.deploy.ContextResourceEnvRef;
 import org.apache.catalina.deploy.NamingResources;
 
 /**
@@ -14,4 +15,13 @@ public class OpenEJBNamingResource exten
         }
         super.addEnvironment(environment);
     }
+
+    @Override
+    public void addResourceEnvRef(ContextResourceEnvRef ref) {
+        // tomcat uses a hastable to store entry type, null values are not allowed
+        if (ref.getType() == null) {
+            ref.setType("");
+        }
+        super.addResourceEnvRef(ref);
+    }
 }
\ No newline at end of file