----- Original Message -----
From: Sérgio 7 Reais
To: dev@velocity.apache.org
Sent: Wednesday, June 06, 2007 11:28 PM
Subject: Re: svn commit: r544359 - in /velocity/engine/trunk:
src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
test/includeevent/compare/test6.cmp
----- Original Message -----
From: Sérgio 7 Reais
To: dev@velocity.apache.org
Sent: Tuesday, June 05, 2007 1:45 AM
Subject: Re: svn commit: r544359 - in /velocity/engine/trunk:
src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
test/includeevent/compare/test6.cmp
----- Original Message -----
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Tuesday, June 05, 2007 12:52 AM
Subject: svn commit: r544359 - in /velocity/engine/trunk:
src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
test/includeevent/compare/test6.cmp
Author: wglass
Date: Mon Jun 4 20:52:21 2007
New Revision: 544359
URL: http://svn.apache.org/viewvc?view=rev&rev=544359
Log:
Correctly display "not found" page. Fixes VELOCITY-551.
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
velocity/engine/trunk/test/includeevent/compare/test6.cmp
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?view=diff&rev=544359&r1=544358&r2=544359
==============================================================================
---
velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
(original)
+++
velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
Mon Jun 4 20:52:21 2007
@@ -70,7 +70,7 @@
boolean exists =
(rs.getLoaderNameForResource(includeResourcePath) != null);
if (!exists)
{
- if (rs.getLoaderNameForResource(notfound) == null)
+ if (rs.getLoaderNameForResource(notfound) != null)
{
return notfound;
Modified: velocity/engine/trunk/test/includeevent/compare/test6.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/test/includeevent/compare/test6.cmp?view=diff&rev=544359&r1=544358&r2=544359
==============================================================================
--- velocity/engine/trunk/test/includeevent/compare/test6.cmp (original)
+++ velocity/engine/trunk/test/includeevent/compare/test6.cmp Mon Jun 4
20:52:21 2007
@@ -1,2 +1,2 @@
Bad include follows
-After the bad include
+page not foundAfter the bad include
--
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007
12:47
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007
12:47
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.9/834 - Release Date: 5/6/2007 14:38
