svn commit: r1413112 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java

[rm...@apache.org]

Author: rmannibucau
Date: Sat Nov 24 00:55:05 2012
New Revision: 1413112

URL: http://svn.apache.org/viewvc?rev=1413112&view=rev
Log:
OPENEJB-1939 using name param to check the object factory signature

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java?rev=1413112&r1=1413111&r2=1413112&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java Sat Nov 24 00:55:05 2012
@@ -19,6 +19,7 @@ package org.apache.tomee.catalina;
 import org.apache.openejb.assembler.classic.WebAppBuilder;
 import org.apache.openejb.loader.SystemInstance;
 
+import javax.naming.CompositeName;
 import javax.naming.NamingException;
 import javax.naming.spi.ObjectFactory;
 
@@ -59,7 +60,7 @@ public class TomcatResourceFactory {
                 if (instance instanceof ObjectFactory) {
                     // not really used as expected but it matches a bit more than before
                     // context is null since it can't be used at this moment (see TomcatWebAppBuilder lifecycle)
-                    return ((ObjectFactory) instance).getObjectInstance(jndiName, null, null, null);
+                    return ((ObjectFactory) instance).getObjectInstance(null, new CompositeName(jndiName), null, null);
                 }
             }
         } catch (Exception e) {