From 2c371a6dcddcaadb9cb337eb66482f24f0f8f727 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 14 May 2012 19:32:46 +0400 Subject: [PATCH] NPE --- .../move/moveClassesOrPackages/DestinationFolderComboBox.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java index 76f3638cfdbf..ca76ad7ffd00 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java @@ -287,6 +287,8 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton } return true; } + if (oItem == null) return itemWrapper == null; + if (itemWrapper == null) return false; if (oItem.getDirectory() != itemWrapper.getDirectory()) { return false; }