forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r447289 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Date Mon, 18 Sep 2006 06:51:03 GMT
Author: thorsten
Date: Sun Sep 17 23:51:02 2006
New Revision: 447289

URL: http://svn.apache.org/viewvc?view=rev&rev=447289
Log:
Fixing bug related to the chainmeta module. It was not possible to use variables that not
have been defined in the forrest-core.xconf with forrest:XXX. This change looks up the name
if the original lookup returns null. This way you can use forrest:xxx for any property you
define via the plain properties or xml.

Modified:
    forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java

Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?view=diff&rev=447289&r1=447288&r2=447289
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Sun Sep 17 23:51:02
2006
@@ -105,8 +105,11 @@
         Object[] attributeValues = super.getAttributeValues(name, modeConf,
                 objectModel);
         for (int i = 0; i < attributeValues.length; i++) {
-            attributeValues[i] = filteringProperties.filter(attributeValues[i]
+            if (null!=attributeValues[i])
+                attributeValues[i] = filteringProperties.filter(attributeValues[i]
                     .toString());
+            else
+                attributeValues[i] = filteringProperties.filter(filteringProperties.getProperty(name));
         }
 
         return attributeValues;



Mime
View raw message