[Remoterengine-commits] r161 - pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server

[noreply at r-forge.r-project.org]

Author: ian_long
Date: 2009-09-20 17:46:45 +0200 (Sun, 20 Sep 2009)
New Revision: 161

Modified:
   pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/RemoteREngine_Server.java
Log:
Additional debug information around assign and parseAndEval functions

Modified: pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/RemoteREngine_Server.java
===================================================================
--- pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/RemoteREngine_Server.java	2009-09-20 15:46:15 UTC (rev 160)
+++ pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/RemoteREngine_Server.java	2009-09-20 15:46:45 UTC (rev 161)
@@ -347,7 +347,7 @@
 	 * @param env environment to assign to (use <code>null</code> for the global environemnt and/or if environments are not supported by the engine
 	 */
 	public void assign(String symbol, REXP value, REXP env) throws REngineException, REXPMismatchException{ 
-		debug( ">> assign" ) ;
+		debug( ">> assign(" + symbol + ")") ;
 		r.assign( symbol, value, env ); 
 	}
 
@@ -429,8 +429,15 @@
 	 * Parse and eval text
 	 */
 	public REXP parseAndEval(String text, REXP where, boolean resolve) throws REngineException, REXPMismatchException {
-		debug( ">> parseAndEval" ) ;
-		return r.parseAndEval( text, where, resolve ); 
+		debug( ">> parseAndEval(" + text + ")" ) ;
+		REXP result = null;
+		try {
+			result = r.parseAndEval( text, where, resolve );
+		} catch (REngineException e) {
+			debug(e.getClass().getName() + ": " + e.getMessage() + " while processing " + text);
+			throw e;
+		}
+		return result;
 	}