Author: cbrisson
Date: Wed Jul 13 22:09:27 2016
New Revision: 1752553
URL: http://svn.apache.org/viewvc?rev=1752553&view=rev
Log:
one more testcase and changelog update for last commit
Modified:
velocity/engine/trunk/src/changes/changes.xml
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java
Modified: velocity/engine/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=1752553&r1=1752552&r2=1752553&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Wed Jul 13 22:09:27 2016
@@ -27,6 +27,12 @@
<body>
<release version="2.0" date="In Subversion">
+ <action type="fix" dev="cbrisson" issue="VELOCITY-553">
+ InvalidReferenceHandler events should not be triggered by null values,
+ or by references testing inside #if / #elseif. Thanks to Renato Steiner
+ for his testcase.
+ </action>
+
<action type="fix" dev="cbrisson" issue="VELOCITY-266">
Take advantage of the major version jump to enforce String keys
in internal Context API
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java?rev=1752553&r1=1752552&r2=1752553&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java
Wed Jul 13 22:09:27 2016
@@ -306,6 +306,12 @@ extends TestCase
fail("Expected exception.");
} catch (RuntimeException e) {}
+ // except if object is tested first
+ s = "#if($a2 and $a2.foobar)yes#{else}no#end";
+ w = new StringWriter();
+ ve.evaluate( context, w, "mystring", s );
+ assertEquals("no", w.toString());
+
// bad object, no property
s = "$a3";
w = new StringWriter();
