From 4dc28abb5be207149d5dae97830635ee31157cbb Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <kirill.likhodedov@jetbrains.com>
Date: Tue, 7 Dec 2010 18:40:45 +0300
Subject: [PATCH] NPE in HgShowConfigCommand: result of
 HgCommandService.execute may be null. [Reviewed by Maxim Shafirov]

---
 .../src/org/zmlx/hg4idea/command/HgShowConfigCommand.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java
index c5692ba36fbc..13ddcea34141 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java
@@ -40,6 +40,10 @@ public class HgShowConfigCommand {
     HgCommandResult result =
       HgCommandService.getInstance(project).execute(repo, "showconfig", null);
 
+    if (result == null) {
+      return Collections.emptyMap();
+    }
+
     Map<String, String> options = new HashMap<String, String>();
     for (String line : result.getOutputLines()) {
       String[] option = StringUtils.splitPreserveAllTokens(line, '=');