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.

2 files changed, 14 insertions, 2 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")
+    ++
+    ")"
+  )
 }
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index b68387f..77b88a2 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -71,8 +71,10 @@ object Stage1{
     )
 
     logger.stage1(s"calling CbtDependency.classLoader")
-    if(cbtHasChanged){
+    if(cbtHasChanged) {
       NailgunLauncher.stage2classLoader = CbtDependency().classLoader(classLoaderCache)
+    }else{
+      classLoaderCache.transient.get( CbtDependency().classpath.string, NailgunLauncher.stage2classLoader )
     }
 
     logger.stage1(s"Run Stage2")