Fix NPE when passing a null filter, which is marked as allowed.
authorEd Swartz <ed.swartz@nokia.com>
Mon, 16 Nov 2009 10:10:51 -0600
changeset 590 959d0be0b766
parent 589 d7c1a3ec899c
child 591 a8e3469fafa4
Fix NPE when passing a null filter, which is marked as allowed.
core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java
--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java	Mon Nov 16 10:07:22 2009 -0600
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java	Mon Nov 16 10:10:51 2009 -0600
@@ -169,7 +169,7 @@
 		for (Iterator<ITemplate> iter = templates.iterator(); iter.hasNext();) {
 			ITemplate template = iter.next();
 			if (isEnabledActivity(template.getTemplateId()) &&
-					filter.accept(template)) {
+					(filter == null || filter.accept(template))) {
 				filteredTemplates.add(template);
 			}
 		}