Return-Path: 
 <commits-return-5474-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 97611 invoked from network); 1 Apr 2008 11:02:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Apr 2008 11:02:14 -0000
Received: (qmail 71080 invoked by uid 500); 1 Apr 2008 11:02:13 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 71036 invoked by uid 500); 1 Apr 2008 11:02:13 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 71027 invoked by uid 99); 1 Apr 2008 11:02:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 04:02:13 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 11:01:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E7E711A9832; Tue,  1 Apr 2008 04:01:51 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r643359 -
 /struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
Date: Tue, 01 Apr 2008 11:01:46 -0000
To: commits@struts.apache.org
From: hermanns@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080401110151.E7E711A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hermanns
Date: Tue Apr  1 04:01:22 2008
New Revision: 643359

URL: http://svn.apache.org/viewvc?rev=643359&view=rev
Log:
WW-2465
Dynamic trees in the dojo plugin causes a freemarker error if the child property returns null

Modified:
    struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl

Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl?rev=643359&r1=643358&r2=643359&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl Tue Apr  1 04:01:22 2008
@@ -21,7 +21,7 @@
  */
 -->
 <div dojoType="struts:StrutsTreeNode" title="${stack.findValue(parameters.nodeTitleProperty)}" id="${stack.findValue(parameters.nodeIdProperty)}">
-<#list stack.findValue(parameters.childCollectionProperty.toString()) as child>
+<#list stack.findValue(parameters.childCollectionProperty.toString())! as child>
     ${stack.push(child)}
     <#include "/${parameters.templateDir}/ajax/treenode-include.ftl" />
     <#assign oldNode = stack.pop() /> <#-- pop the node off of the stack, but don't show it -->