From 4c12f61a28bad36b2b160a7b9f3c55a6bfdcf40c Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Thu, 15 Mar 2012 19:23:48 +0400
Subject: [PATCH] properly report error in initialization loop

---
 .../jetbrains/jet/lang/types/lang/JetStandardLibrary.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java
index 4f57f231574..5dde1648790 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java
@@ -60,13 +60,13 @@ public class JetStandardLibrary {
     // before any type checking is run
     public static synchronized void initialize(@NotNull Project project) {
         if (instance == null) {
-            if (initializing) {
-                throw new IllegalStateException("builtin library initialization loop");
-            }
             if (initializationFailed != null) {
                 throw new RuntimeException(
                         "builtin library initialization failed previously: " + initializationFailed, initializationFailed);
             }
+            if (initializing) {
+                throw new IllegalStateException("builtin library initialization loop");
+            }
             initializing = true;
             try {
                 instance = new JetStandardLibrary(project);