Swap execution order of eval(String) and eval(Reader)

Squareys · Squareys · commit fededa42fe77 · 2015-03-10T12:34:25.000+01:00
This order is much more efficient with the recently swapped execution order of compile(String) and compile(Reader). See e663151. Signed-off-by: Squareys <Squareys@googlemail.com>
diff --git a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java
@@ -128,7 +128,23 @@ public class JavaEngine extends AbstractScriptEngine{
 	 */
 	@Override
 	public Object eval(String script) throws ScriptException{
-		return eval(new StringReader(script));
+		final Writer writer = getContext().getErrorWriter();
+		try{
+			final Class<?> clazz = compile(script);
+			javaService.run(clazz);
+		}
+		catch (Exception e){
+			if (writer != null){
+				final PrintWriter err = new PrintWriter(writer);
+				e.printStackTrace(err);
+				err.flush();
+			}
+			else{
+				if (e instanceof ScriptException) throw (ScriptException) e;
+				throw new ScriptException(e);
+			}
+		}
+		return null;
 	}
 
 	/**
@@ -143,22 +159,14 @@ public Object eval(String script) throws ScriptException{
 	 */
 	@Override
 	public Object eval(Reader reader) throws ScriptException{
-		final Writer writer = getContext().getErrorWriter();
+		String script;
 		try{
-			final Class<?> clazz = compile(reader);
-			javaService.run(clazz);
-		} catch (Exception e){
-			if (writer != null){
-				final PrintWriter err = new PrintWriter(writer);
-				e.printStackTrace(err);
-				err.flush();
-			} else{
-				if (e instanceof ScriptException)
-					throw (ScriptException) e;
-				throw new ScriptException(e);
-			}
+			script = getReaderContentsAsString(reader);
 		}
-		return null;
+		catch (IOException e){
+			throw new ScriptException(e);
+		}
+		return eval(script);
 	}
 
 	/**

-Original file line number
+Diff line change
  */
 @Override
 publicObjecteval(Stringscript) throwsScriptException{
 -returneval(newStringReader(script));
 +finalWriterwriter = getContext().getErrorWriter();
 +try{
 +finalClass<?> clazz = compile(script);
 +javaService.run(clazz);
 + }
 +catch (Exceptione){
 +if (writer != null){
 +finalPrintWritererr = newPrintWriter(writer);
 +e.printStackTrace(err);
 +err.flush();
 + }
 +else{
 +if (einstanceofScriptException) throw (ScriptException) e;
 +thrownewScriptException(e);
 + }
 + }
 +returnnull;
+ }
 /**
  */
 @Override
 publicObjecteval(Readerreader) throwsScriptException{
 -finalWriterwriter = getContext().getErrorWriter();
 +Stringscript;
 try{
 -finalClass<?> clazz = compile(reader);
 -javaService.run(clazz);
 - } catch (Exceptione){
 -if (writer != null){
 -finalPrintWritererr = newPrintWriter(writer);
 -e.printStackTrace(err);
 -err.flush();
 - } else{
 -if (einstanceofScriptException)
 -throw (ScriptException) e;
 -thrownewScriptException(e);
 - }
 +script = getReaderContentsAsString(reader);
+ }
 -returnnull;
 +catch (IOExceptione){
 +thrownewScriptException(e);
 + }
 +returneval(script);
+ }
 /**