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

[rmannibucau]

Author: rmannibucau
Date: Sun Oct  7 14:58:17 2012
New Revision: 1395319

URL: http://svn.apache.org/viewvc?rev=1395319&view=rev
Log:
better place for () - not feature

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=1395319&r1=1395318&r2=1395319&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:58:17 2012
@@ -483,8 +483,8 @@ public class TomcatWebAppBuilder impleme
 
     public synchronized ContextInfo standaAloneWebAppInfo(final File file) {
         for (ContextInfo info : infos.values()) {
-            if (info.appInfo != null
-                && (info.appInfo.webAppAlone && (file.equals(new 
File(info.appInfo.path)) || file.equals(new File(info.appInfo.path + 
".war"))))) {
+            if (info.appInfo != null && info.appInfo.webAppAlone
+                    && ((file.equals(new File(info.appInfo.path)) || 
file.equals(new File(info.appInfo.path + ".war"))))) {
                 return info;
             }
             if (info.standardContext != null && (file.equals(new 
File(info.standardContext.getDocBase())) || file.equals(new 
File(info.standardContext.getDocBase() + ".war")))) {
@@ -495,8 +495,8 @@ public class TomcatWebAppBuilder impleme
         // 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))) {
+            if (info.appInfo != null && info.appInfo.webAppAlone
+                    && (info.appInfo.path.endsWith(path) || (info.appInfo.path 
+ ".war").endsWith(path))) {
                 return info;
             }
         }