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

better diagnostic of ioexception when FileOutputStream constructor throws FileNotFoundException

Browse Source
This commit is contained in:
Maxim.Mossienko
2016-07-01 00:39:07 +02:00
parent 02fe00b54a
commit 695de43728
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/io/ReadWriteDirectBufferWrapper.java
+17 -9
View File
@@ -56,13 +56,16 @@ public class ReadWriteDirectBufferWrapper extends DirectBufferWrapper {
final RandomAccessFile myFile;
FileContext(final File file) throws IOException {
myFile = FileUtilRt.doIOOperation(new FileUtilRt.RepeatableIOOperation<RandomAccessFile, FileNotFoundException>() {
myFile = FileUtilRt.doIOOperation(new FileUtilRt.RepeatableIOOperation<RandomAccessFile, IOException>() {
@Nullable
@Override
public RandomAccessFile execute(boolean finalAttempt) throws FileNotFoundException {
public RandomAccessFile execute(boolean finalAttempt) throws IOException {
try {
return new RandomAccessFile(file, RW);
} catch (FileNotFoundException ex) {
if (!file.getParentFile().exists()) {
throw new IOException("Parent file doesn't exist:" + file);
}
if (!finalAttempt) return null;
throw ex;
}
@@ -91,12 +94,14 @@ public class ReadWriteDirectBufferWrapper extends DirectBufferWrapper {
try {
if (fileContext == null) fileContext = new FileContext(myFile);
final FileChannel channel = fileContext.myFile.getChannel();
if (fileContext.myFile != null) {
final FileChannel channel = fileContext.myFile.getChannel();
channel.position(myPosition);
buffer.rewind();
channel.write(buffer);
myDirty = false;
channel.position(myPosition);
buffer.rewind();
channel.write(buffer);
myDirty = false;
}
}
catch (IOException e) {
LOG.error(e);
@@ -109,7 +114,10 @@ public class ReadWriteDirectBufferWrapper extends DirectBufferWrapper {
final ByteBuffer buffer = getCachedBuffer();
if (buffer == null || !isDirty()) return;
//noinspection SSBasedInspection
doFlush(null, buffer).dispose();
Disposable disposable = doFlush(null, buffer);
if (disposable != null) {
//noinspection SSBasedInspection
disposable.dispose();
}
}
}
platform/util/src/com/intellij/util/io/ResizeableMappedFile.java
+5 -2
View File
@@ -125,13 +125,16 @@ public class ResizeableMappedFile implements Forceable {
final File lengthFile = getLengthFile();
DataOutputStream stream = null;
try {
stream = FileUtilRt.doIOOperation(new FileUtilRt.RepeatableIOOperation<DataOutputStream, FileNotFoundException>() {
stream = FileUtilRt.doIOOperation(new FileUtilRt.RepeatableIOOperation<DataOutputStream, IOException>() {
@Nullable
@Override
public DataOutputStream execute(boolean lastAttempt) throws FileNotFoundException {
public DataOutputStream execute(boolean lastAttempt) throws IOException {
try {
return new DataOutputStream(new FileOutputStream(lengthFile));
} catch (FileNotFoundException ex) {
if (!lengthFile.getParentFile().exists()) {
throw new IOException("Parent file doesn't exist:" + lengthFile);
}
if (!lastAttempt) return null;
throw ex;
}