From 966fa7be62528a97459128eebd351b764265bfc7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 9 Jul 2012 20:34:52 +0200
Subject: [PATCH] Untie FileUtil from registry

---
 platform/platform-resources-en/src/misc/registry.properties  | 1 -
 platform/util/src/com/intellij/openapi/util/io/FileUtil.java | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index a89e5545c6b2..89f0f0358d2f 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -136,7 +136,6 @@ debugger.breakpoint.message.full.trace.description='Log message to console' brea
 debugger.breakpoint.use.breakpoints.popup=true
 
 filesystem.useNative=true
-filesystem.useChannels=false
 
 analyze.exceptions.on.the.fly=false
 # suppress inspection "UnusedProperty"
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 8be075edc93a..0496a682e4a6 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -18,7 +18,6 @@ package com.intellij.openapi.util.io;
 import com.intellij.CommonBundle;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ObjectUtils;
@@ -73,6 +72,8 @@ public class FileUtil extends FileUtilRt {
 
   private static final int MAX_FILE_DELETE_ATTEMPTS = 10;
 
+  private static final boolean USE_FILE_CHANNELS = SystemProperties.getBooleanProperty("idea.fs.useChannels", false);
+
   @NotNull
   public static String join(@NotNull final String... parts) {
     return StringUtil.join(parts, File.separator);
@@ -504,7 +505,7 @@ public class FileUtil extends FileUtilRt {
   }
 
   public static void copy(@NotNull InputStream inputStream, @NotNull OutputStream outputStream) throws IOException {
-    if (Registry.is("filesystem.useChannels") && inputStream instanceof FileInputStream && outputStream instanceof FileOutputStream) {
+    if (USE_FILE_CHANNELS && inputStream instanceof FileInputStream && outputStream instanceof FileOutputStream) {
       final FileChannel fromChannel = ((FileInputStream)inputStream).getChannel();
       try {
         final FileChannel toChannel = ((FileOutputStream)outputStream).getChannel();