Re: svn commit: r945271 - in /tomcat/trunk/test/org/apache/catalina/startup: DuplicateMappingParamFilter.java DuplicateMappingParamServlet.java NoMappingParamServlet.java ParamServlet.java TestContextConfigAnnotation.java

[Rainer Jung]

On 17.05.2010 19:50, Konstantin Kolinko wrote:
2010/5/17<ma...@apache.org>:
Author: markt
Date: Mon May 17 17:45:53 2010
New Revision: 945271
URL: http://svn.apache.org/viewvc?rev=945271&view=rev
Log:
Fix Eclipse warnings.
Reduce line length.



@@ -243,14 +253,9 @@ public class TestContextConfigAnnotation
             if (eclipseFile.exists()) {
                 if (antFile.lastModified()>= eclipseFile.lastModified()) {
                     return antFile;
-                } else {
-                    return eclipseFile;
                 }
-            } else {
-                return antFile;
             }
-        } else {
-            return eclipseFile;
         }
+        return eclipseFile;
     }
  }

Was: return antFile;
Now: return eclipseFile;

This breaks "ant test" for me. I run the test directly using ant, 
without Eclipse being involved. In case antFile exists, but eclipseFile 
not, we still need to return antFile. Like e.g.

Index: test/org/apache/catalina/startup/TestContextConfigAnnotation.java
===================================================================
--- test/org/apache/catalina/startup/TestContextConfigAnnotation.java 
(revision 945310)
+++ test/org/apache/catalina/startup/TestContextConfigAnnotation.java 
(working copy)
@@ -254,7 +254,9 @@
                 if (antFile.lastModified() >= 
eclipseFile.lastModified()) {
                     return antFile;
                 }
+                return eclipseFile;
             }
+            return antFile;
         }
         return eclipseFile;
     }

Regards,

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org