From c952b7c60da89b9b2f5dd478ade399dbddd06785 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Tue, 21 Oct 2008 20:14:40 +0000
Subject: [PATCH] [251124] - fixing language support templates

---
 .../org/eclipse/cdt/core/templateengine/TemplateEngine.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
index 4d122759972..944bc7fd4ff 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngine.java
@@ -301,7 +301,7 @@ public class TemplateEngine {
 				if (toolChain != null) {
 					for (int j=0; j < toolChains.length; j++) {
 						if (toolChains[j].equals(toolChain)) {
-							if (usageFilter != null && filterPattern.matches(usageFilter)) {
+							if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
 								matchedTemplateInfoList.add(templateInfo);
 							} else if (usageFilter == null) {
 								matchedTemplateInfoList.add(templateInfo);
@@ -310,7 +310,7 @@ public class TemplateEngine {
 						}
 					}
 				} else {
-					if (usageFilter != null && filterPattern.matches(usageFilter)) {
+					if ((usageFilter != null) && (filterPattern != null) && usageFilter.matches(filterPattern)) {
 						matchedTemplateInfoList.add(templateInfo);
 					} else if (usageFilter == null) {
 						matchedTemplateInfoList.add(templateInfo);