You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/08/16 10:01:12 UTC

svn commit: r1158141 - /openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

Author: rmannibucau
Date: Tue Aug 16 08:01:12 2011
New Revision: 1158141

URL: http://svn.apache.org/viewvc?rev=1158141&view=rev
Log:
reverting error in tomcat web app builder comming from trunk

Modified:
    openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

Modified: openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1158141&r1=1158140&r2=1158141&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/branches/openejb-3.2.x/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Tue Aug 16 08:01:12 2011
@@ -339,11 +339,11 @@ public class TomcatWebAppBuilder impleme
             Context openejbContext = getContainerSystem().getJNDIContext();
             openejbContext = (Context) openejbContext.lookup("openejb");
 
-            // Context root = (Context) ContextBindings.getClassLoader().lookup("");
-            // Context comp = (Context) ContextBindings.getClassLoader().lookup("comp");
+            Context root = (Context) ContextBindings.getClassLoader().lookup("");
+            Context comp = (Context) ContextBindings.getClassLoader().lookup("comp");
 
-            Context root = ncl.getNamingContext();
-            Context comp = (Context) root.lookup("comp");
+            // Context root = ncl.getNamingContext();
+            // Context comp = (Context) root.lookup("comp");
             safeBind(root, "openejb", openejbContext);
 
             // add context to WebDeploymentInfo
@@ -352,7 +352,7 @@ public class TomcatWebAppBuilder impleme
                 if (("/" + webAppInfo.contextRoot).equals(standardContext.getPath()) || isRoot) {
                     CoreWebDeploymentInfo webContext = (CoreWebDeploymentInfo) getContainerSystem().getWebDeploymentInfo(webAppInfo.moduleId);
                     if (webContext != null) {
-                        webContext.setJndiEnc(root);
+                        webContext.setJndiEnc(comp);
                     }
 
                     try {