MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] fixes sloppy stream handling in FileTypeManager

Browse Source
This commit is contained in:
Roman Shevchenko
2017-02-10 18:29:13 +01:00
parent 0b15abe336
commit 927a97a95c
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+21 -17
View File
@@ -795,14 +795,14 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
@NotNull
private FileType detectFromContentAndCache(@NotNull final VirtualFile file) throws IOException {
long start = System.currentTimeMillis();
final InputStream inputStream = ((FileSystemInterface)file.getFileSystem()).getInputStream(file);
if (toLog()) {
log("F: detectFromContentAndCache(" + file.getName() + "):" + " inputStream=" + streamInfo(inputStream));
}
final Ref<FileType> result = new Ref<>(UnknownFileType.INSTANCE);
file.putUserData(IO_EXCEPTION_HAPPENED, null);
Ref<FileType> result = new Ref<>(UnknownFileType.INSTANCE);
boolean r = false;
InputStream inputStream = ((FileSystemInterface)file.getFileSystem()).getInputStream(file);
try {
if (toLog()) {
log("F: detectFromContentAndCache(" + file.getName() + "):" + " inputStream=" + streamInfo(inputStream));
}
file.putUserData(IO_EXCEPTION_HAPPENED, null);
r = processFirstBytes(inputStream, DETECT_BUFFER_SIZE, byteSequence -> {
boolean isText = guessIfText(file, byteSequence);
CharSequence text;
@@ -848,19 +848,23 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
});
}
finally {
if (toLog()) {
try (InputStream newStream = ((FileSystemInterface)file.getFileSystem()).getInputStream(file)) {
byte[] buffer = new byte[50];
int n = newStream.read(buffer, 0, buffer.length);
log("F: detectFromContentAndCache(" + file.getName() + "): result: " + result.get().getName() +
"; processor ret: " + r +
"; stream: " + streamInfo(inputStream) +
"; newStream: " + streamInfo(newStream) +
"; read: " + n +
"; buffer: " + Arrays.toString(buffer));
try {
if (toLog()) {
try (InputStream newStream = ((FileSystemInterface)file.getFileSystem()).getInputStream(file)) {
byte[] buffer = new byte[50];
int n = newStream.read(buffer, 0, buffer.length);
log("F: detectFromContentAndCache(" + file.getName() + "): result: " + result.get().getName() +
"; processor ret: " + r +
"; stream: " + streamInfo(inputStream) +
"; newStream: " + streamInfo(newStream) +
"; read: " + n +
"; buffer: " + Arrays.toString(buffer));
}
}
}
inputStream.close();
finally {
inputStream.close();
}
}
FileType fileType = result.get();