svn commit: r1395287 - in /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: TomcatWebAppBuilder.java deployment/TomcatWebappDeployer.java

[rmannibucau]

Author: rmannibucau
Date: Sun Oct  7 12:29:24 2012
New Revision: 1395287

URL: http://svn.apache.org/viewvc?rev=1395287&view=rev
Log:
using File.equals instead of string comparison

Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.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=1395287&r1=1395286&r2=1395287&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 12:29:24 2012
@@ -481,12 +481,13 @@ public class TomcatWebAppBuilder impleme
         }
     }
 
-    public synchronized ContextInfo standaAloneWebAppInfo(final String path) {
+    public synchronized ContextInfo standaAloneWebAppInfo(final File file) {
         for (ContextInfo info : infos.values()) {
             if (info.appInfo != null
-                && (info.appInfo.webAppAlone && 
(path.equals(info.appInfo.path) || path.equals(info.appInfo.path + ".war")))) {
+                && (info.appInfo.webAppAlone && (file.equals(new 
File(info.appInfo.path)) || file.equals(new File(info.appInfo.path + 
".war"))))) {
                 return info;
-            } else if (info.standardContext != null && 
(path.equals(info.standardContext.getDocBase()) || 
path.equals(info.standardContext.getDocBase() + ".war"))) {
+            }
+            if (info.standardContext != null && (file.equals(new 
File(info.standardContext.getDocBase())) || file.equals(new 
File(info.standardContext.getDocBase() + ".war")))) {
                 return info;
             }
         }

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java?rev=1395287&r1=1395286&r2=1395287&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
 Sun Oct  7 12:29:24 2012
@@ -41,7 +41,7 @@ public class TomcatWebappDeployer implem
             throw new OpenEJBRuntimeException(e);
         }
 
-        final TomcatWebAppBuilder.ContextInfo info = 
tomcatWebAppBuilder.standaAloneWebAppInfo(file.getAbsolutePath());
+        final TomcatWebAppBuilder.ContextInfo info = 
tomcatWebAppBuilder.standaAloneWebAppInfo(file);
         if (info == null || info.appInfo == null) {
             LOGGER.error("Can't find of appInfo for " + (file != null ? 
file.getAbsolutePath() : null) + ", availables: " + 
tomcatWebAppBuilder.availableApps());
         }