Fix #11 println("hello") outputs empty line

Author: ngocdaothanh

src/main/java/scalive/Repl.java

@@ -6,12 +6,15 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 
+import scala.Console;
+import scala.Function0;
 import scala.Option;
+import scala.runtime.AbstractFunction0;
 import scala.tools.nsc.interpreter.ILoop;
 import scala.tools.nsc.Settings;
 
 public class Repl {
-    public static void run(ClassLoader cl, String classpath, InputStream in, OutputStream out) {
+    public static void run(ClassLoader cl, String classpath, final InputStream in, final OutputStream out) {
         // Without the below settings, there will be error:
         // Failed to initialize compiler: object scala.runtime in compiler mirror not found.
         // ** Note that as of 2.8 scala does not assume use of the java classpath.
@@ -23,7 +26,7 @@ public static void run(ClassLoader cl, String classpath, InputStream in, OutputS
         // loader but the "java.class.path" system property does not contain Scala JARs
         //
         // http://stackoverflow.com/questions/18150961/scala-runtime-in-compiler-mirror-not-found-but-working-when-started-with-xboo
-        Settings settings = new Settings();
+        final Settings settings = new Settings();
 
         // http://www.scala-lang.org/old/node/8002
         settings.classpath().value_$eq(classpath);
@@ -33,12 +36,32 @@ public static void run(ClassLoader cl, String classpath, InputStream in, OutputS
         // http://stackoverflow.com/questions/5950025/multiple-instances-of-static-variables
         settings.explicitParentLoader_$eq(Option.apply(cl));
 
-        ILoop repl = new ILoop(
+        final ILoop repl = new ILoop(
             new BufferedReader(new InputStreamReader(in)),
             new PrintWriter(out)
         );
 
-        // This call does not return until the stream (connection) is closed
-        repl.process(settings);
+        // https://github.com/xitrum-framework/scalive/issues/11
+        // http://stackoverflow.com/questions/25623779/implementing-a-scala-function-in-java
+        Console.withIn(in, new AbstractFunction0<Object>() {
+            @Override
+            public Object apply() {
+                Console.withOut(out, new AbstractFunction0<Object>() {
+                    @Override
+                    public Object apply() {
+                        Console.withErr(out, new AbstractFunction0<Object>() {
+                            @Override
+                            public Object apply() {
+                                // This call does not return until the stream (connection) is closed
+                                repl.process(settings);
+                                return null;
+                            }
+                        });
+                        return null;
+                    }
+                });
+                return null;
+            }
+        });
     }
 }

src/main/java/scalive/Server.java

@@ -3,12 +3,13 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.lang.reflect.Method;
 import java.net.Socket;
 import java.net.URLClassLoader;
 
 public class Server {
     public static void serve(Socket client, String[] jarSearchDirs) throws Exception {
+        // Create a REPL console and wire IO streams of the socket to it
+
         InputStream  in  = client.getInputStream();
         OutputStream out = client.getOutputStream();
 
@@ -24,10 +25,8 @@ public static void serve(Socket client, String[] jarSearchDirs) throws Exception
             URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader();
             loadDependencyJars(cl, jarSearchDirs);
 
-            String   classpath = Classpath.getClasspath(cl);
-            Class<?> repl      = Class.forName("scalive.Repl");
-            Method   method    = repl.getMethod("run", ClassLoader.class, String.class, InputStream.class, OutputStream.class);
-            method.invoke(null, cl, classpath, in, out);
+            String classpath = Classpath.getClasspath(cl);
+            Repl.run(cl, classpath, in, out);
         } finally {
             System.setIn(oldIn);
             System.setOut(oldOut);