You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2005/02/25 04:29:40 UTC
svn commit: r155294 -
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
Author: nbubna
Date: Thu Feb 24 19:29:38 2005
New Revision: 155294
URL: http://svn.apache.org/viewcvs?view=rev&rev=155294
Log:
make sure items are never set to null
Modified:
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
Modified: jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java?view=diff&r1=155293&r2=155294
==============================================================================
--- jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java (original)
+++ jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/tools/AbstractSearchTool.java Thu Feb 24 19:29:38 2005
@@ -135,7 +135,7 @@
*
* @author <a href="mailto:nathan@esha.com">Nathan Bubna</a>
* @since VelocityTools 1.0
- * @version $Revision: 1.8 $ $Date: 2004/11/11 03:46:44 $
+ * @version $Revision$ $Date$
*/
public abstract class AbstractSearchTool extends AbstractPagerTool
{
@@ -228,7 +228,10 @@
list = executeQuery(criteria);
/* save the new results */
- setItems(list);
+ if (list != null)
+ {
+ setItems(list);
+ }
}
return list;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org