CLJ-1578 don't throw when a core Var replaces another Var to avoid breaking ns reloading

bronsa · stuarthalloway · commit 24177494ea36 · 2014-11-14T10:58:45.000-05:00
Signed-off-by: Stuart Halloway &lt;stu@cognitect.com&gt;
diff --git a/src/jvm/clojure/lang/Namespace.java b/src/jvm/clojure/lang/Namespace.java
@@ -82,7 +82,7 @@ private void warnOrFailOnReplace(Symbol sym, Object o, Object v){
     if (o instanceof Var)
         {
         Namespace ns = ((Var)o).ns;
-        if (ns == this)
+        if (ns == this || (v instanceof Var && ((Var)v).ns  == RT.CLOJURE_NS))
             return;
         if (ns != RT.CLOJURE_NS)
             throw new IllegalStateException(sym + " already refers to: " + o + " in namespace: " + name);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private void warnOrFailOnReplace(Symbol sym, Object o, Object v){`
`82`	`82`	`if (o instanceof Var)`
`83`	`83`	`{`
`84`	`84`	`Namespace ns = ((Var)o).ns;`
`85`		`- if (ns == this)`
	`85`	`+ if (ns == this \|\| (v instanceof Var && ((Var)v).ns == RT.CLOJURE_NS))`
`86`	`86`	`return;`
`87`	`87`	`if (ns != RT.CLOJURE_NS)`
`88`	`88`	`throw new IllegalStateException(sym + " already refers to: " + o + " in namespace: " + name);`