From 148c3466da7161c4e8b8ef18306799e6e11aa78a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 13 Apr 2016 18:15:12 +0200 Subject: [PATCH] [platform] fine-tuning process output readers: git --- .../git4idea/src/git4idea/commands/GitTextHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/src/git4idea/commands/GitTextHandler.java b/plugins/git4idea/src/git4idea/commands/GitTextHandler.java index 466b030d9b8b..ebed7e33d080 100644 --- a/plugins/git4idea/src/git4idea/commands/GitTextHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitTextHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -28,6 +28,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.io.BaseOutputReader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -152,9 +153,10 @@ public abstract class GitTextHandler extends GitHandler { return myCharset; } + @NotNull @Override - protected boolean useNonBlockingRead() { - return !Registry.is("git.blocking.read"); + protected BaseOutputReader.Options readerOptions() { + return Registry.is("git.blocking.read") ? BaseOutputReader.Options.BLOCKING : BaseOutputReader.Options.NON_BLOCKING; } }