From 4d6fee0d861b99db79fad4f4b74c3ed08b823fd3 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Fri, 3 Jun 2011 20:22:20 +0400
Subject: [PATCH] IDEA-69855 NPE Timer might have been not initialized yet.
 [Reviewed by irengrig]

---
 plugins/git4idea/src/git4idea/commands/GitTask.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitTask.java b/plugins/git4idea/src/git4idea/commands/GitTask.java
index aeee1251d300..491066a0769e 100644
--- a/plugins/git4idea/src/git4idea/commands/GitTask.java
+++ b/plugins/git4idea/src/git4idea/commands/GitTask.java
@@ -373,7 +373,9 @@ public class GitTask {
     }
 
     public void dispose() {
-      myTimer.cancel();
+      if (myTimer != null) {
+        myTimer.cancel();
+      }
     }
   }