Fix stage2 classloader not being stored in transient cache

and thus being re-created on second and subsequent runs.
Also use classloader from cache for Builds rather than new one, which should properly make Build dependencies work.

1 files changed, 11 insertions, 1 deletions

diff --git a/stage1/ClassLoaderCache.scala b/stage1/ClassLoaderCache.scala
index 10d872d..44b8d7d 100644
--- a/stage1/ClassLoaderCache.scala
+++ b/stage1/ClassLoaderCache.scala
@@ -15,5 +15,15 @@ class ClassLoaderCache(logger: Logger){
     new ConcurrentHashMap[AnyRef,ClassLoader],
     Some(logger)
   )
-  override def toString = s"""ClassLoaderCache("""+ persistent.keys.keySet.toVector.map(_.toString).sorted.map(" "++_).mkString("\n","\n","\n") +""")"""
+  override def toString = (
+    s"ClassLoaderCache("
+    ++
+    persistent.keys.keySet.toVector.map(_.toString.split(":").mkString("\n")).sorted.mkString("\n\n","\n\n","\n\n")
+    ++
+    "---------"
+    ++
+    transient.keys.keySet.toVector.map(_.toString.split(":").mkString("\n")).sorted.mkString("\n\n","\n\n^","\n\n")
+    ++
+    ")"
+  )
 }