From 97a99dbbc695252661df21890211c62c8b66b3f2 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 Mar 2011 15:56:56 +0300
Subject: [PATCH] ea-26321

---
 .../quickfix/CreateConstructorParameterFromFieldFix.java  | 5 ++++-
 .../intention/impl/AssignFieldFromParameterAction.java    | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
index e3aafe432b11..fd62c6b0b77e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
@@ -139,7 +139,10 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
 
     // do not introduce assignment in chanined constructor
     if (HighlightControlFlowUtil.getChainedConstructors(constructor) == null) {
-      AssignFieldFromParameterAction.addFieldAssignmentStatement(project, getField(), parameter, editor);
+      PsiField field = getField();
+      if (field != null) {
+        AssignFieldFromParameterAction.addFieldAssignmentStatement(project, field, parameter, editor);
+      }
     }
     return true;
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java
index c8a9646f2e05..64c107c99414 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java
@@ -87,10 +87,10 @@ public class AssignFieldFromParameterAction extends BaseIntentionAction {
     }
   }
 
-  public static void addFieldAssignmentStatement(final Project project,
-                                                 final PsiField field,
-                                                 final PsiParameter parameter,
-                                                 final Editor editor) throws IncorrectOperationException {
+  public static void addFieldAssignmentStatement(@NotNull Project project,
+                                                 @NotNull PsiField field,
+                                                 @NotNull PsiParameter parameter,
+                                                 @NotNull Editor editor) throws IncorrectOperationException {
     final PsiMethod method = (PsiMethod)parameter.getDeclarationScope();
     PsiCodeBlock methodBody = method.getBody();
     if (methodBody == null) return;