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

[vfs] read cached file content using cached file length (EA-77680)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-01-20 16:37:14 +01:00
parent ef2aac96a8
commit 758dd6c2da
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+5 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -489,9 +489,11 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
boolean reloadFromDelegate;
boolean outdated;
int fileId;
long length = -1L;
synchronized (myInputLock) {
fileId = getFileId(file);
outdated = checkFlag(fileId, MUST_RELOAD_CONTENT) || FSRecords.getLength(fileId) == -1L;
outdated = checkFlag(fileId, MUST_RELOAD_CONTENT) || (length = FSRecords.getLength(fileId)) == -1L;
reloadFromDelegate = outdated || (contentStream = readContent(file)) == null;
}
@@ -529,9 +531,8 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
}
else {
try {
final int length = (int)file.getLength();
assert length >= 0 : file;
return FileUtil.loadBytes(contentStream, length);
return FileUtil.loadBytes(contentStream, (int)length);
}
catch (IOException e) {
throw FSRecords.handleError(e);