Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv28237
Modified Files:
Tag: MMBase-1_8
PatternNodeFunctionProvider.java
Log Message:
avoid a NPE, I thing happening for node fields
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: PatternNodeFunctionProvider.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/functions/PatternNodeFunctionProvider.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- PatternNodeFunctionProvider.java 29 Mar 2006 15:05:51 -0000 1.9
+++ PatternNodeFunctionProvider.java 9 Dec 2008 10:04:49 -0000 1.9.2.1
@@ -32,7 +32,7 @@
* xml).
*
* @author Michiel Meeuwissen
- * @version $Id: PatternNodeFunctionProvider.java,v 1.9 2006/03/29 15:05:51
michiel Exp $
+ * @version $Id: PatternNodeFunctionProvider.java,v 1.9.2.1 2008/12/09
10:04:49 michiel Exp $
* @since MMBase-1.8
*/
public class PatternNodeFunctionProvider extends FunctionProvider {
@@ -106,7 +106,13 @@
{
Matcher fields = fieldsPattern.matcher(template);
while (fields.find()) {
- fields.appendReplacement(sb,
node.getStringValue(fields.group(1)));
+ String s = node.getStringValue(fields.group(1));
+ if (s == null) {
+ // I think getStringValue should perhaps never return
null, but if it does,
+ // avoid the NPE
+ s = "";
+ }
+ fields.appendReplacement(sb, s);
}
fields.appendTail(sb);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
