From 353d1c488b153ad33fed2e56ad77583a6f58858a Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 15 Jan 2014 15:28:54 +0400 Subject: [PATCH] Fixed redundant done invocation on asByteArray call --- .../src/org/jetbrains/jet/codegen/ClassFileFactory.java | 6 +++--- .../src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java index 1029fdb5a51..b939ae6aa07 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java @@ -71,7 +71,7 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp return answer; } - private void done() { + void done() { if (!isDone) { isDone = true; for (PackageCodegen codegen : package2codegen.values()) { @@ -199,15 +199,15 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp ); } + @NotNull @Override public byte[] asByteArray() { - done(); return builderFactory.asBytes(generators.get(relativeClassFilePath).classBuilder); } + @NotNull @Override public String asText() { - done(); return builderFactory.asText(generators.get(relativeClassFilePath).classBuilder); } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java index bf7b1c0ea0e..56632c4d3bc 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java @@ -56,6 +56,8 @@ public class KotlinCodegenFacade { for (Map.Entry> entry : packageFqNameToFiles.entrySet()) { generatePackage(state, entry.getKey(), entry.getValue(), errorHandler); } + + state.getFactory().done(); } public static void generatePackage(