From b1d67868c29424ccc7a4ead1d4c4deb6e8a01a9b Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 28 May 2012 14:01:18 +0400 Subject: [PATCH] EA-35112 - IOE: JspJavaFileImpl.setPackageName --- .../move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java index cadb5c34b01a..38f3fe4e2e08 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java @@ -231,7 +231,7 @@ public class MoveClassesOrPackagesUtil { if (!moveDestination.equals(file.getContainingDirectory())) { LOG.assertTrue(file.getVirtualFile() != null, aClass); MoveFilesOrDirectoriesUtil.doMoveFile(file, moveDestination); - if (file instanceof PsiClassOwner && newPackage != null) { + if (file instanceof PsiClassOwner && newPackage != null && !JspPsiUtil.isInJspFile(file)) { ((PsiClassOwner)file).setPackageName(newPackage.getQualifiedName()); } }