Revision: 4768
http://sourceforge.net/p/vexi/code/4768
Author: mkpg2
Date: 2015-02-26 04:19:15 +0000 (Thu, 26 Feb 2015)
Log Message:
-----------
Compilation fix. Jpp not updated.
Modified Paths:
--------------
branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/JS.jpp
branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/XMLRPC.jpp
branches/vexi3/org.vexi-library.js/src/main/jpp/org/vexi/js/VexiJS.jpp
Modified: branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/JS.jpp
===================================================================
--- branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/JS.jpp
2015-02-26 04:12:07 UTC (rev 4767)
+++ branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/JS.jpp
2015-02-26 04:19:15 UTC (rev 4768)
@@ -858,8 +858,8 @@
JS value = null;
try {
if (rangeTrap != null) {
- value = Scheduler.findCurrent().runBeforeGet(rangeTrap,
key);
- key = Scheduler.findCurrent().cascadedTo;
+ value = Scheduler.expectCurrent().runBeforeGet(rangeTrap,
key);
+ key = Scheduler.expectCurrent().cascadedTo;
// if null value returned, avoiding innermost cascade
if (key == null) {
return value;
@@ -873,7 +873,7 @@
if (rangeTrap != null) {
// value in: cascaded back to the lowermost read trap
// value out: returned from the outer most read trap
- value = Scheduler.findCurrent().runAfterGet(value,
rangeTrapException);
+ value = Scheduler.expectCurrent().runAfterGet(value,
rangeTrapException);
}
}
return value;
@@ -884,8 +884,8 @@
JSExn rangeTrapException = null;
try {
if (rangeTrap != null) {
- value = Scheduler.findCurrent().runBeforePut(rangeTrap,
value, key);
- key = Scheduler.findCurrent().cascadedTo;
+ value = Scheduler.expectCurrent().runBeforePut(rangeTrap,
value, key);
+ key = Scheduler.expectCurrent().cascadedTo;
// returned from trap without cascading (cleaned up in
finally clause)
if (key==null) {
return;
@@ -897,7 +897,7 @@
throw e;
} finally {
if (rangeTrap != null) {
- Scheduler.findCurrent().runAfterPut(rangeTrapException);
+ Scheduler.expectCurrent().runAfterPut(rangeTrapException);
}
}
}
@@ -1016,8 +1016,8 @@
JS value = null;
try {
if (rangeTrap != null) {
- value =
Scheduler.findCurrent().runBeforeGet(rangeTrap, key);
- key = Scheduler.findCurrent().cascadedTo;
+ value =
Scheduler.expectCurrent().runBeforeGet(rangeTrap, key);
+ key = Scheduler.expectCurrent().cascadedTo;
// if null value returned, avoiding innermost cascade
if (key == null) {
return value;
@@ -1035,7 +1035,7 @@
if (rangeTrap != null) {
// value in: cascaded back to the lowermost read trap
// value out: returned from the outer most read trap
- value = Scheduler.findCurrent().runAfterGet(value,
rangeTrapException);
+ value = Scheduler.expectCurrent().runAfterGet(value,
rangeTrapException);
}
}
return value;
@@ -1047,8 +1047,8 @@
JSExn rangeTrapException = null;
try {
if (rangeTrap != null) {
- value = Scheduler.findCurrent().runBeforePut(rangeTrap,
value, key);
- key = Scheduler.findCurrent().cascadedTo;
+ value = Scheduler.expectCurrent().runBeforePut(rangeTrap,
value, key);
+ key = Scheduler.expectCurrent().cascadedTo;
// returned from trap without cascading (cleaned up in
finally clause)
if (key==null) {
return;
@@ -1073,7 +1073,7 @@
throw e;
} finally {
if (rangeTrap != null) {
- Scheduler.findCurrent().runAfterPut(rangeTrapException);
+ Scheduler.expectCurrent().runAfterPut(rangeTrapException);
}
}
}
Modified: branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/XMLRPC.jpp
===================================================================
--- branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/XMLRPC.jpp
2015-02-26 04:12:07 UTC (rev 4767)
+++ branches/vexi3/org.vexi-library.js/src/main/jpp/org/ibex/js/XMLRPC.jpp
2015-02-26 04:19:15 UTC (rev 4768)
@@ -353,7 +353,7 @@
}
public final JS call(final JSArray args) throws JSExn {
- final Scheduler sched = Scheduler.findCurrent();
+ final Scheduler sched = Scheduler.expectCurrent();
return sched.backgroundCall("make XML-RPC call", new Callable<Object,
JS>() {
public JS run(Object A) throws Exception {
return doCall(args);
Modified: branches/vexi3/org.vexi-library.js/src/main/jpp/org/vexi/js/VexiJS.jpp
===================================================================
--- branches/vexi3/org.vexi-library.js/src/main/jpp/org/vexi/js/VexiJS.jpp
2015-02-26 04:12:07 UTC (rev 4767)
+++ branches/vexi3/org.vexi-library.js/src/main/jpp/org/vexi/js/VexiJS.jpp
2015-02-26 04:19:15 UTC (rev 4768)
@@ -27,7 +27,7 @@
// this.logger = scheduler.logger;
// }
- static private Scheduler scheduler() { return Scheduler.findCurrent(); }
+ static private Scheduler scheduler() { return Scheduler.expectCurrent(); }
static private Logger logger() {
Scheduler s = Scheduler.getCurrent();
// HACK ??
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
