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 2012/10/07 16:57:28 UTC

svn commit: r1395318 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Author: rmannibucau
Date: Sun Oct  7 14:57:27 2012
New Revision: 1395318

URL: http://svn.apache.org/viewvc?rev=1395318&view=rev
Log:
enhancing a bit the algorithm to match a deployed webapp - weird case which can happen on CI machines

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

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1395318&r1=1395317&r2=1395318&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Sun Oct  7 14:57:27 2012
@@ -491,6 +491,16 @@ public class TomcatWebAppBuilder impleme
                 return info;
             }
         }
+
+        // still not found - trying another algorithm - weird but it seems to happen
+        final String path = file.getAbsolutePath();
+        for (ContextInfo info : infos.values()) {
+            if (info.appInfo != null
+                    && (info.appInfo.webAppAlone && info.appInfo.path.endsWith(path) || (info.appInfo.path + ".war").endsWith(path))) {
+                return info;
+            }
+        }
+
         return null;
     }