diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
index 3b0c1731ba2d..a9f47ec2f6f6 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
@@ -219,7 +219,7 @@ class OptimizedFileManager17 extends com.sun.tools.javac.file.JavacFileManager {
   }
 
   private class InputFileObject extends BaseFileObject {
-    private String name;
+    private final String name;
     private final File file;
     private Reference<File> absFileRef;
 
@@ -256,7 +256,12 @@ class OptimizedFileManager17 extends com.sun.tools.javac.file.JavacFileManager {
 
     @Override
     public JavaFileObject.Kind getKind() {
-      return getKind(name);
+      for (Kind kind : Kind.values()) {
+        if (kind != Kind.OTHER && name.endsWith(kind.extension)) {
+          return kind;
+        }
+      }
+      return Kind.OTHER;
     }
 
     @Override
diff --git a/jps/lib/optimizedFileManager.jar b/jps/lib/optimizedFileManager.jar
index ce76aa5dbc8d..8a12d502b63b 100644
Binary files a/jps/lib/optimizedFileManager.jar and b/jps/lib/optimizedFileManager.jar differ