[Mercurial] NPE fixed.

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
index c3774d182af2de7b192b10e413cb17ba41146349..210ac7de88e2c0748d7872dd7471ee4a8b429c64 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgRevisionNumber;
 
@@ -86,6 +87,7 @@ public class HgStatusCommand {
     return doExecute(repo, null);
   }
 
+  @Nullable
   public HgChange execute(VirtualFile repo, @NotNull String file) {
     Set<HgChange> changes = doExecute(repo, file);
     return changes.isEmpty() ? null : changes.iterator().next();
@@ -136,6 +138,9 @@ public class HgStatusCommand {
     HgCommandResult result = service.execute(repo, "status", arguments);
     Set<HgChange> changes = new HashSet<HgChange>();
     HgChange previous = null;
+    if (result == null) {
+      return changes;
+    }
     for (String line : result.getOutputLines()) {
       if (StringUtils.isBlank(line) || line.length() < ITEM_COUNT) {
         LOG.warn("Unexpected line in status '" + line + '\'');