From 208d4e5f74921221f258022eef433cc0a4e296b4 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 1 Feb 2012 21:13:26 +0100
Subject: [PATCH] do not convert spaces for local paths

---
 .../src/org/jetbrains/jps/incremental/Paths.java          | 8 ++++++--
 .../src/org/jetbrains/jps/javac/JavacFileManager.java     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/Paths.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Paths.java
index 17cd1cea16d9..893377d034c6 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/Paths.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/Paths.java
@@ -38,6 +38,10 @@ public class Paths {
   }
 
   public static URI toURI(String localPath) {
+    return toURI(localPath, true);
+  }
+
+  private static URI toURI(String localPath, boolean convertSpaces) {
     try {
       String p = FileUtil.toSystemIndependentName(localPath);
       if (!p.startsWith("/")) {
@@ -46,7 +50,7 @@ public class Paths {
       if (p.startsWith("//")) {
         p = "//" + p;
       }
-      return new URI("file", null, p.replaceAll(" ", "%20"), null);
+      return new URI("file", null, convertSpaces? p.replaceAll(" ", "%20") : p, null);
     }
     catch (URISyntaxException e) {
       throw new Error(e);
@@ -54,6 +58,6 @@ public class Paths {
   }
 
   public static File convertToFile(final URI uri) {
-    return new File(toURI(uri.getPath()));
+    return new File(toURI(uri.getPath(), false));
   }
 }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
index 531159e48660..a7aac0fce6dc 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java
@@ -135,7 +135,7 @@ class JavacFileManager extends ForwardingJavaFileManager<StandardJavaFileManager
   }
 
   private File findOutputDir(File src) {
-    File file = src.getParentFile();
+    File file = FileUtil.getParentFile(src);
     while (file != null) {
       for (Map.Entry<File, Set<File>> entry : myOutputsMap.entrySet()) {
         if (entry.getValue().contains(file)) {
-- 
2.32.0