From 2f813a3be756a3f9f0d09c1973b2a024f4842511 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 25 Apr 2013 10:35:20 +0200
Subject: [PATCH] NPE on dispose

---
 .../openapi/diff/impl/dir/DirDiffTableModel.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
index e2c10a067478..1ac6b8b7e46c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -223,10 +223,12 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
           reportException(VcsBundle.message("refresh.failed.message", StringUtil.decapitalize(e.getLocalizedMessage())));
         }
         finally {
-          myTree.setSource(mySrc);
-          myTree.setTarget(myTrg);
-          myTree.update(mySettings);
-          applySettings();
+          if (myTree != null) {
+            myTree.setSource(mySrc);
+            myTree.setTarget(myTrg);
+            myTree.update(mySettings);
+            applySettings();
+          }
         }
       }
     });