svn commit: r1589304 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Apr 22 23:16:40 2014
New Revision: 1589304

URL: http://svn.apache.org/r1589304
Log:
TOMEE-1183 windows path issue for ears

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

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1589304&r1=1589303&r2=1589304&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java Tue Apr 22 23:16:40 2014
@@ -80,6 +80,7 @@ import javax.persistence.EntityManagerFa
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -185,7 +186,7 @@ public class TomcatJndiBuilder {
             contextInfo = builder.getContextInfo(standardContext);
             if (webContext == null && contextInfo != null && contextInfo.appInfo != null) { // can happen if deployed from apps/
                 for (WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
-                    if (webAppInfo.path != null && webAppInfo.path.equals(standardContext.getDocBase())) {
+                    if (webAppInfo.path != null && webAppInfo.path.replace(File.separatorChar, '/').equals(standardContext.getDocBase())) {
                         webContext = cs.getWebContext(webAppInfo.moduleId);
                         if (webContext != null) {
                             break;