Author: rmannibucau
Date: Tue Oct 23 22:03:34 2012
New Revision: 1401500
URL: http://svn.apache.org/viewvc?rev=1401500&view=rev
Log:
TOMEE-499 handling ROOT webapps in OpenEJBContextConfig
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1401500&r1=1401499&r2=1401500&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Tue Oct 23 22:03:34 2012
@@ -175,6 +175,12 @@ public class OpenEJBContextConfig extend
final String file = currentUrl.getFile();
String webAppDir = new File(path).getName();
+ if ("ROOT".equals(webAppDir)) { // no contextroot so use the
host
+ webAppDir = webAppInfo.host;
+ if (webAppDir == null) {
+ webAppDir = "";
+ }
+ }
int idx = file.indexOf(webAppDir);
// some more tries to manage context config (path can be
different from context)
