Revision: 4292
http://vexi.svn.sourceforge.net/vexi/?rev=4292&view=rev
Author: jeffbuhrt
Date: 2011-10-25 17:54:59 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
Cleanup to handle exceptions when running Vexi 'memory' debugger 'Assert GC'
Modified Paths:
--------------
trunk/org.vexi-library.js/src/main/java/org/ibex/js/JSON.java
Modified: trunk/org.vexi-library.js/src/main/java/org/ibex/js/JSON.java
===================================================================
--- trunk/org.vexi-library.js/src/main/java/org/ibex/js/JSON.java
2011-10-25 16:08:09 UTC (rev 4291)
+++ trunk/org.vexi-library.js/src/main/java/org/ibex/js/JSON.java
2011-10-25 17:54:59 UTC (rev 4292)
@@ -41,17 +41,23 @@
sb.append("\":");
Scheduler sched = Scheduler.getCurrent();
if(sched==null){
+// // not in an executable context, so cannot serialize
completely, return trap locations
+// Trap t = value.getTrap(key);
+// if (t != null && (t=t.findRead()) != null) {
+// for(; t!=null; t=t.findRead()){
+// TrapHolder th = (TrapHolder)t;
+// sb.append(JSU.toString(th.function()));
+// sb.append("<-");
+// }
+// }
+ // not in an executable context, so cannot serialize
completely,
+ marshal(sb, avoidCycles, value.get(key));
// not in an executable context, so cannot serialize
completely, return trap locations
- Trap t = value.getTrap(key);
- if (t != null && (t=t.findRead()) != null) {
- for(; t!=null; t=t.findRead()){
- TrapHolder th = (TrapHolder)t;
- sb.append(JSU.toString(th.function()));
- sb.append("<-");
- }
- }
+ marshal(sb, avoidCycles, value.get(key));
}
- marshal(sb, avoidCycles, sched.getAndTriggerTraps(value,
key));
+ else {
+ marshal(sb, avoidCycles,
sched.getAndTriggerTraps(value, key));
+ }
if(ks.hasNext())sb.append(",");
}
sb.append("}");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
