Author: nbubna
Date: Thu Feb 24 20:40:59 2005
New Revision: 155305
URL: http://svn.apache.org/viewcvs?view=rev&rev=155305
Log:
ok, really make sure that getItems() never returns 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=155304&r2=155305
==============================================================================
---
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 20:40:59 2005
@@ -227,11 +227,15 @@
/* perform a new query */
list = executeQuery(criteria);
- /* save the new results */
- if (list != null)
+ /* because we can't trust executeQuery() not to return null
+ and getItems() must _never_ return null... */
+ if (list == null)
{
- setItems(list);
+ list = Collections.EMPTY_LIST;
}
+
+ /* save the new results */
+ setItems(list);
}
return list;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
