On 17/05/2010 20:25, Rainer Jung wrote:
> 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

> 
> 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;
>      }

Yep. My bad. Not paying enough attention. I'll put that right (noting
that change weas post the 7.0.0-RC2 tag).

Mark



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

Reply via email to