You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by wg...@apache.org on 2006/11/11 17:55:41 UTC
svn commit: r473760 - in /jakarta/velocity/engine/trunk:
src/java/org/apache/velocity/runtime/RuntimeInstance.java
src/test/org/apache/velocity/test/MiscTestCase.java xdocs/changes.xml
Author: wglass
Date: Sat Nov 11 08:55:40 2006
New Revision: 473760
URL: http://svn.apache.org/viewvc?view=rev&rev=473760
Log:
RuntimeInstance.getProperty now returns value set with RuntimeInstance.setProperty, even before initialization. Thanks to Claude Brisson for the patch. VELOCITY-493.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MiscTestCase.java
jakarta/velocity/engine/trunk/xdocs/changes.xml
Modified: jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java?view=diff&rev=473760&r1=473759&r2=473760
==============================================================================
--- jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java (original)
+++ jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java Sat Nov 11 08:55:40 2006
@@ -469,7 +469,23 @@
*/
public Object getProperty(String key)
{
- Object o = configuration.getProperty(key);
+ Object o = null;
+
+ /**
+ * Before initialization, check the user-entered properties first.
+ */
+ if (!initialized && !initializing && overridingProperties != null)
+ {
+ o = overridingProperties.get(key);
+ }
+
+ /**
+ * After initialization, configuration will hold all properties.
+ */
+ if (o == null)
+ {
+ o = configuration.getProperty(key);
+ }
if (o instanceof String)
{
return StringUtils.nullTrim((String) o);
Modified: jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MiscTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MiscTestCase.java?view=diff&rev=473760&r1=473759&r2=473760
==============================================================================
--- jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MiscTestCase.java (original)
+++ jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MiscTestCase.java Sat Nov 11 08:55:40 2006
@@ -25,6 +25,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.velocity.runtime.RuntimeInstance;
import org.apache.velocity.util.StringUtils;
/**
@@ -46,6 +47,14 @@
return new TestSuite(MiscTestCase.class);
}
+ public void testRuntimeInstanceProperties()
+ {
+ // check that runtime instance properties can be set and retrieved
+ RuntimeInstance ri = new RuntimeInstance();
+ ri.setProperty("baabaa.test","the answer");
+ assertEquals("the answer",ri.getProperty("baabaa.test"));
+ }
+
public void testStringUtils()
{
/*
Modified: jakarta/velocity/engine/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/xdocs/changes.xml?view=diff&rev=473760&r1=473759&r2=473760
==============================================================================
--- jakarta/velocity/engine/trunk/xdocs/changes.xml (original)
+++ jakarta/velocity/engine/trunk/xdocs/changes.xml Sat Nov 11 08:55:40 2006
@@ -27,6 +27,11 @@
<body>
<release version="1.5-dev" date="in Subversion">
+ <action type="fix" dev="wglass" issue="VELOCITY-493" due-to="Claude Brisson">
+ RuntimeInstance.getProperty now returns value set with RuntimeInstance.setProperty,
+ even before initialization.
+ </action>
+
<action type="add" dev="wglass" issue="VELOCITY-435">
When macros have incorrect number of arguments, if property
"velocimacro.arguments.strict" is set to true a ParseErrorException
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org