From 70906b469eea2c67176f199f2693a93f3c1ac2f7 Mon Sep 17 00:00:00 2001
From: Nikolay Matveev <Nikolay.Matveev@jetbrains.com>
Date: Wed, 19 Jan 2011 13:27:31 +0300
Subject: [PATCH] PHP NPE in CreateFromTemplateDialog [rev=Anna.Kozlova]

---
 .../ide/fileTemplates/ui/CreateFromTemplateDialog.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
index ad2198618a03..9fbf32255e04 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public class CreateFromTemplateDialog extends DialogWrapper {
     setTitle(IdeBundle.message("title.new.from.template", template.getName()));
 
     myDefaultProperties = defaultProperties == null ? FileTemplateManager.getInstance().getDefaultProperties() : defaultProperties;
-    FileTemplateUtil.fillDefaultProperties(defaultProperties, directory);
+    FileTemplateUtil.fillDefaultProperties(myDefaultProperties, directory);
 
     String[] unsetAttributes = null;
     try {