From b011fdce4adfda98aeb36702a918cb226808eae1 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 30 Jan 2012 21:23:27 +0100 Subject: [PATCH] reduce the number of force() calls on storages --- .../src/org/jetbrains/jps/incremental/CompileContext.java | 4 ++++ .../src/org/jetbrains/jps/incremental/IncProjectBuilder.java | 4 ++++ .../src/org/jetbrains/jps/server/ProjectDescriptor.java | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java index 8d5a286733aa..fdaa66d55eb5 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java @@ -210,6 +210,10 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler return myDataManager; } + public TimestampStorage getTimestampStorage() { + return myTsStorage; + } + public void processMessage(BuildMessage msg) { if (msg.getKind() == BuildMessage.Kind.ERROR) { myErrorsFound = true; diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java index 931bc55ca636..7beeac50794e 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java @@ -102,6 +102,10 @@ public class IncProjectBuilder { } private static void flushContext(CompileContext context) { + if (context != null) { + context.getTimestampStorage().force(); + context.getDataManager().flush(false); + } final ExternalJavacDescriptor descriptor = ExternalJavacDescriptor.KEY.get(context); if (descriptor != null) { try { diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ProjectDescriptor.java b/jps/jps-builders/src/org/jetbrains/jps/server/ProjectDescriptor.java index 8cdce41f81b3..11ee1a1a5aaa 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/server/ProjectDescriptor.java +++ b/jps/jps-builders/src/org/jetbrains/jps/server/ProjectDescriptor.java @@ -53,9 +53,5 @@ public final class ProjectDescriptor { } } } - else { - timestamps.getStorage().force(); - dataManager.flush(false); - } } } -- 2.23.3