Revision: 4773 http://sourceforge.net/p/vexi/code/4773 Author: mkpg2 Date: 2015-02-26 22:03:05 +0000 (Thu, 26 Feb 2015) Log Message: -----------
Modified Paths: -------------- branches/vexi3/org.vexi-core.main/src/main/java/org/vexi/core/Blessing.java branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Scheduler.java Modified: branches/vexi3/org.vexi-core.main/src/main/java/org/vexi/core/Blessing.java =================================================================== --- branches/vexi3/org.vexi-core.main/src/main/java/org/vexi/core/Blessing.java 2015-02-26 21:59:17 UTC (rev 4772) +++ branches/vexi3/org.vexi-core.main/src/main/java/org/vexi/core/Blessing.java 2015-02-26 22:03:05 UTC (rev 4773) @@ -45,7 +45,7 @@ if (t==null || (t = t.findRead())==null) { return get(key); } - return Main.SCHEDULER.runInCurrent(t); + return Main.SCHEDULER.runInCurrent(t, null); } public JS get(JS key) throws JSExn { Modified: branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Scheduler.java =================================================================== --- branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Scheduler.java 2015-02-26 21:59:17 UTC (rev 4772) +++ branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Scheduler.java 2015-02-26 22:03:05 UTC (rev 4773) @@ -189,7 +189,8 @@ /** Execute read traps */ - public JS runInCurrent(Trap t, JS value) throws JSExn { + public JS runInCurrent(Trap t, JS value) throws JSExn { return runInCurrent(t, value, null); } + public JS runInCurrent(Trap t, JS value, JS trapname) throws JSExn { if (!(t.function() instanceof JSFunction)) { return t.function(); } @@ -201,7 +202,7 @@ setJSThread(newThread(this, "current/trap", trapf)); } Interpreter old = jsthread.currentInterpreter; - jsthread.currentInterpreter = new Interpreter(jsthread, t, value, false, null); + jsthread.currentInterpreter = new Interpreter(jsthread, t, value, false, trapname); try { return (JS)jsthread.currentInterpreter.run(null); } finally { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn