From b2e952317be2df831a8df002eaa4c0b360f4d4ba Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 13 Nov 2009 15:36:15 +0300 Subject: [PATCH] test fixed --- .../impl/compiler/ArtifactAdditionalCompileScopeProvider.java | 6 +++++- .../packaging/impl/compiler/IncrementalArtifactsCompiler.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactAdditionalCompileScopeProvider.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactAdditionalCompileScopeProvider.java index 9b57f409a0..b546eca267 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactAdditionalCompileScopeProvider.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactAdditionalCompileScopeProvider.java @@ -30,7 +30,11 @@ import java.util.Set; public class ArtifactAdditionalCompileScopeProvider extends AdditionalCompileScopeProvider { @Override public CompileScope getAdditionalScope(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter, @NotNull Project project) { - if (ArtifactCompileScope.getArtifacts(baseScope) != null || !filter.acceptCompiler(IncrementalArtifactsCompiler.getInstance(project))) { + if (ArtifactCompileScope.getArtifacts(baseScope) != null) { + return null; + } + final IncrementalArtifactsCompiler compiler = IncrementalArtifactsCompiler.getInstance(project); + if (compiler == null || !filter.acceptCompiler(compiler)) { return null; } final Set artifacts = ArtifactCompileScope.getArtifactsToBuild(project, baseScope); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java index c3a7643cd4..d69002ac1c 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalArtifactsCompiler.java @@ -73,8 +73,10 @@ public class IncrementalArtifactsCompiler implements PackagingCompiler { private static final Key BUILDER_CONTEXT_KEY = Key.create("artifacts_builder_context"); @Nullable private PackagingCompilerCache myOutputItemsCache; + @Nullable public static IncrementalArtifactsCompiler getInstance(@NotNull Project project) { - return CompilerManager.getInstance(project).getCompilers(IncrementalArtifactsCompiler.class)[0]; + final IncrementalArtifactsCompiler[] compilers = CompilerManager.getInstance(project).getCompilers(IncrementalArtifactsCompiler.class); + return compilers.length == 1 ? compilers[0] : null; } private static ArtifactPackagingProcessingItem[] collectItems(ArtifactsProcessingItemsBuilderContext builderContext, final Project project) { -- 2.11.4.GIT