Merge pull request #142 from tomas-pluskal/rtest

Reverting last Gauthier's commit to Rsession.java

src/main/java/net/sf/mzmine/util/R/Rsession/Rsession.java

@@ -86,16 +86,6 @@ public class Rsession implements Logger {
     private static String tmpDir = null;
     public static final Object R_SESSION_SEMAPHORE = new Object();
     public static ArrayList<Integer> PORTS_REG = new ArrayList<Integer>();
-    //** GLG HACK: Logging fix **//
-    // No sink file (Passed to false) a lot faster not to sink the output
-    // We never need this feature in MZmine anyway...
-    boolean SINK_OUTPUT = false; //true;
-    // GLG HACK: fixed sink file in case of multiple instances
-    // (Appending the port number of the instance to file name)
-    String SINK_FILE_BASE = ".Rout";
-    String SINK_FILE = null;
-    String lastOuput = "";
-
 
     void cleanupListeners() {
         if (loggers != null) {
@@ -499,9 +489,6 @@ public Rsession(final Logger console, RserverConf serverconf,
 
         loggers = new LinkedList<Logger>();
         loggers.add(console);
-
-        // Make sink file specific to current Rserve instance
-        SINK_FILE = SINK_FILE_BASE + "-" + serverconf.port;
 
         startup();
     }
@@ -624,8 +611,6 @@ void begin(boolean tryLocal) {
             // int port = (rServeConf.port != -1) ? rServeConf.port :
             // RserverConf.getNewAvailablePort();
             if (port_tmp != port) {
-                // Keep sink file specific to current Rserve instance
-            	SINK_FILE = SINK_FILE_BASE + "-" + port;
                 println("WARNING: Changed the original requested port from "
                         + port_tmp + " to " + port + "!", Level.WARNING);
             }
@@ -1146,6 +1131,10 @@ public boolean silentlyVoidEval(String expression) {
         return silentlyVoidEval(expression, TRY_MODE_DEFAULT);
     }
 
+    boolean SINK_OUTPUT = true;
+    String SINK_FILE = ".Rout";
+
+    String lastOuput = "";
 
     public String getLastOutput() {
         if (!SINK_OUTPUT) {