CLJ-2484 Move user.clj initialization out of RT<clinit>

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

Diff for: src/jvm/clojure/java/api/Clojure.java

@@ -13,6 +13,7 @@
 import clojure.lang.IFn;
 import clojure.lang.Symbol;
 import clojure.lang.Var;
+import clojure.lang.RT;
 
 /**
  * <p>The Clojure class provides a minimal interface to bootstrap Clojure access
@@ -93,6 +94,7 @@ public static Object read(String s) {
     }
 
     static {
+        RT.init();
         Symbol edn = (Symbol) var("clojure.core", "symbol").invoke("clojure.edn");
         var("clojure.core", "require").invoke(edn);
     }

Diff for: src/jvm/clojure/lang/Compile.java

@@ -32,7 +32,7 @@ public class Compile{
 private static final Var unchecked_math = RT.var("clojure.core", "*unchecked-math*");
 
 public static void main(String[] args) throws IOException, ClassNotFoundException{
-
+	RT.init();
 	OutputStreamWriter out = (OutputStreamWriter) RT.OUT.deref();
 	PrintWriter err = RT.errPrintWriter();
 	String path = System.getProperty(PATH_PROP);

Diff for: src/jvm/clojure/lang/RT.java

@@ -335,7 +335,7 @@ public Object invoke(Object arg1) {
 	v.setMeta(map(DOC_KEY, "Sequentially read and evaluate the set of forms contained in the file.",
 	              arglistskw, list(vector(namesym))));
 	try {
-		doInit();
+		load("clojure/core");
 	}
 	catch(Exception e) {
 		throw Util.sneakyThrow(e);
@@ -389,10 +389,6 @@ else if(failIfNotFound) {
 	}
 }
 
-static public void init() {
-	RT.errPrintWriter().println("No need to call RT.init() anymore");
-}
-
 static public long lastModified(URL url, String libfile) throws IOException{
 	URLConnection connection = url.openConnection();
 	try {
@@ -467,8 +463,13 @@ else if(!loaded && failIfNotFound)
 			scriptbase.contains("_") ? " Please check that namespaces with dashes use underscores in the Clojure file name." : ""));
 }
 
-static void doInit() throws ClassNotFoundException, IOException{
-	load("clojure/core");
+static public void init() {
+	doInit();
+}
+
+private static boolean INIT = false; // init guard
+private synchronized static void doInit() {
+	if(INIT) {return;} else {INIT=true;}
 
 	Var.pushThreadBindings(
 			RT.mapUniqueKeys(CURRENT_NS, CURRENT_NS.deref(),
@@ -491,6 +492,9 @@ static void doInit() throws ClassNotFoundException, IOException{
 		Var start_servers = var("clojure.core.server", "start-servers");
 		start_servers.invoke(System.getProperties());
 	}
+	catch(Exception e) {
+		throw Util.sneakyThrow(e);
+	}
 	finally {
 		Var.popThreadBindings();
 	}

Diff for: src/jvm/clojure/lang/Util.java

@@ -245,6 +245,7 @@ static private <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
 }
 
 static public Object loadWithClass(String scriptbase, Class<?> loadFrom) throws IOException, ClassNotFoundException{
+    RT.init();
     Var.pushThreadBindings(RT.map(new Object[] { Compiler.LOADER, loadFrom.getClassLoader() }));
     try {
         return RT.var("clojure.core", "load").invoke(scriptbase);

Diff for: src/jvm/clojure/main.java

@@ -23,16 +23,19 @@ public class main{
 final static private Var MAIN = RT.var("clojure.main", "main");
 
 public static void legacy_repl(String[] args) {
+    RT.init();
     REQUIRE.invoke(CLOJURE_MAIN);
     LEGACY_REPL.invoke(RT.seq(args));
 }
 
 public static void legacy_script(String[] args) {
+    RT.init();
     REQUIRE.invoke(CLOJURE_MAIN);
     LEGACY_SCRIPT.invoke(RT.seq(args));
 }
 
 public static void main(String[] args) {
+    RT.init();
     REQUIRE.invoke(CLOJURE_MAIN);
     MAIN.applyTo(RT.seq(args));
 }