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

save fs state and release project in finally block

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-09-08 14:19:32 +02:00
parent 485c3eee17
commit 7bb6243762
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+26 -22
View File
@@ -10,9 +10,9 @@ import com.intellij.util.io.DataOutputStream;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.Channels;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.builders.java.dependencyView.Callbacks;
import org.jetbrains.jps.api.*;
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
import org.jetbrains.jps.builders.java.dependencyView.Callbacks;
import org.jetbrains.jps.incremental.MessageHandler;
import org.jetbrains.jps.incremental.ModuleBuildTarget;
import org.jetbrains.jps.incremental.Utils;
@@ -161,32 +161,36 @@ final class BuildSession implements Runnable, CanceledStatus {
}
final BuildFSState fsState = new BuildFSState(false);
final ProjectDescriptor pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
myProjectDescriptor = pd;
if (fsStateStream != null) {
try {
try {
final ProjectDescriptor pd = myBuildRunner.load(msgHandler, dataStorageRoot, fsState);
myProjectDescriptor = pd;
if (fsStateStream != null) {
try {
fsState.load(fsStateStream, pd);
applyFSEvent(pd, myInitialFSDelta);
try {
fsState.load(fsStateStream, pd);
applyFSEvent(pd, myInitialFSDelta);
}
finally {
fsStateStream.close();
}
}
finally {
fsStateStream.close();
catch (Throwable e) {
LOG.error(e);
fsState.clearAll();
}
}
catch (Throwable e) {
LOG.error(e);
fsState.clearAll();
}
myLastEventOrdinal = myInitialFSDelta != null? myInitialFSDelta.getOrdinal() : 0L;
// free memory
myInitialFSDelta = null;
// ensure events from controller are processed after FSState initialization
myEventsProcessor.startProcessing();
myBuildRunner.runBuild(pd, cs, myConstantSearch, msgHandler, true, myBuildType);
}
finally {
saveData(fsState, dataStorageRoot);
}
myLastEventOrdinal = myInitialFSDelta != null? myInitialFSDelta.getOrdinal() : 0L;
// free memory
myInitialFSDelta = null;
// ensure events from controller are processed after FSState initialization
myEventsProcessor.startProcessing();
myBuildRunner.runBuild(pd, cs, myConstantSearch, msgHandler, true, myBuildType);
saveData(fsState, dataStorageRoot);
}
private void saveData(final BuildFSState fsState, File dataStorageRoot) {