Author: nbubna
Date: Thu Feb 12 04:42:48 2009
New Revision: 743617
URL: http://svn.apache.org/viewvc?rev=743617&view=rev
Log:
VELOCITY-693 merge fix from trunk, add to change log
Modified:
velocity/engine/branches/1.6.x/src/changes/changes.xml
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Modified: velocity/engine/branches/1.6.x/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/changes/changes.xml?rev=743617&r1=743616&r2=743617&view=diff
==============================================================================
--- velocity/engine/branches/1.6.x/src/changes/changes.xml (original)
+++ velocity/engine/branches/1.6.x/src/changes/changes.xml Thu Feb 12 04:42:48
2009
@@ -28,6 +28,11 @@
<release version="1.6.2" date="2009-02-21">
+ <action type="fix" dev="nbubna" issue="VELOCITY-693">
+ Fix problem with FileResourceLoader's resourceExists() when
+ configured w/multiple paths.
+ </action>
+
<action type="fix" dev="nbubna" issue="VELOCITY-681">
Fix regression in proxying of macro args
</action>
Modified:
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=743617&r1=743616&r2=743617&view=diff
==============================================================================
---
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
(original)
+++
velocity/engine/branches/1.6.x/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Thu Feb 12 04:42:48 2009
@@ -201,7 +201,10 @@
try
{
File file = getFile(path, name);
- return file.canRead();
+ if (file.canRead())
+ {
+ return true;
+ }
}
catch (Exception ioe)
{
