From d7dadda142d260e6ec65bc2f39ceba6031fb0152 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Jan 2012 13:43:05 +0100 Subject: [PATCH] IDEA-80379 Perforce: UOE at com.intellij.openapi.vcs.rollback.DefaultRollbackEnvironment.rollbackModifiedWithoutCheckout --- .../src/com/intellij/openapi/vcs/VcsVFSListener.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java index dbf307d0134e..9c2c9a0d03b1 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java @@ -223,7 +223,7 @@ public abstract class VcsVFSListener implements Disposable { getSingleFileDeletePromptTemplate(), myRemoveOption); } - protected void beforeContentsChange(VirtualFile file) { + protected void beforeContentsChange(VirtualFileEvent event, VirtualFile file) { } private void addFileToMove(final VirtualFile file, final String newParentPath, final String newName) { @@ -378,10 +378,8 @@ public abstract class VcsVFSListener implements Disposable { @Override public void beforeContentsChange(VirtualFileEvent event) { - if (!isEventIgnored(event, false)) { - assert !event.getFile().isDirectory(); - VcsVFSListener.this.beforeContentsChange(event.getFile()); - } + assert !event.getFile().isDirectory(); + VcsVFSListener.this.beforeContentsChange(event, event.getFile()); } }