From 20557804d92e2b7c3d75d88f121fe1b57d627300 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 27 Aug 2013 22:04:14 +0400 Subject: [PATCH] EA-49123 (do not load extensions from static initializer) --- .../openapi/fileTypes/impl/FileTypeManagerImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 7e9e2d21eaa2..25803d922ee2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -367,10 +367,6 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME return type; } - private static class FileTypeDetectorHolder { - private static final FileTypeDetector[] FILE_TYPE_DETECTORS = Extensions.getExtensions(FileTypeDetector.EP_NAME); - } - private static final AtomicInteger DETECTED_COUNT = new AtomicInteger(); private static final int DETECT_BUFFER_SIZE = 8192; @@ -403,8 +399,9 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME else { text = null; } + FileType detected = null; - for (FileTypeDetector detector : FileTypeDetectorHolder.FILE_TYPE_DETECTORS) { + for (FileTypeDetector detector : Extensions.getExtensions(FileTypeDetector.EP_NAME)) { detected = detector.detect(file, byteSequence, text); if (detected != null) break; }