1 files changed, 4 insertions, 3 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java
index 5f4664cde24f..41062a1b18d1 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.util.IncorrectOperationException;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class GenerateGetterAndSetterHandler extends GenerateGetterSetterHandlerBase{
   private final GenerateGetterHandler myGenerateGetterHandler = new GenerateGetterHandler();
@@ -35,9 +36,9 @@ public class GenerateGetterAndSetterHandler extends GenerateGetterSetterHandlerB
     GenerationInfo[] getters = myGenerateGetterHandler.generateMemberPrototypes(aClass, original);
     GenerationInfo[] setters = myGenerateSetterHandler.generateMemberPrototypes(aClass, original);
 
-    if (getters.length > 0 && setters.length > 0){
-      array.add(getters[0]);
-      array.add(setters[0]);
+    if (getters.length + setters.length > 0){
+      Collections.addAll(array, getters);
+      Collections.addAll(array, setters);
     }
 
     return array.toArray(new GenerationInfo[array.size()]);