[MMBASE CVS] src/org/mmbase/util/functions PatternNodeFunctionProvider.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv28306

Modified Files:
        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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- PatternNodeFunctionProvider.java    27 Jul 2007 14:07:07 -0000      1.15
+++ PatternNodeFunctionProvider.java    9 Dec 2008 10:05:31 -0000       1.16
@@ -32,7 +32,7 @@
  * xml).
  *
  * @author Michiel Meeuwissen
- * @version $Id: PatternNodeFunctionProvider.java,v 1.15 2007/07/27 14:07:07 
michiel Exp $
+ * @version $Id: PatternNodeFunctionProvider.java,v 1.16 2008/12/09 10:05:31 
michiel Exp $
  * @since MMBase-1.8
  */
 public class PatternNodeFunctionProvider extends FunctionProvider {
@@ -190,7 +190,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
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs