Revision: 4828 http://sourceforge.net/p/vexi/code/4828 Author: mkpg2 Date: 2015-11-13 04:06:45 +0000 (Fri, 13 Nov 2015) Log Message: ----------- Fix. NPE getting thread description.
Modified Paths: -------------- branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSFunction.java branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Thread.java Modified: branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSFunction.java =================================================================== --- branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSFunction.java 2015-11-12 01:29:43 UTC (rev 4827) +++ branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/JSFunction.java 2015-11-13 04:06:45 UTC (rev 4828) @@ -37,6 +37,10 @@ if(object==null) return null; return object.get(key); } + public JS getSafe(JS key){ + if(object==null) return null; + return object.getSafe(key); + } public void put(JS key, JS val) throws JSExn { useObj().put(key, val); } public void addTrap(JS key, JS function) throws JSExn { useObj().addTrap(key, function); } Modified: branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Thread.java =================================================================== --- branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Thread.java 2015-11-12 01:29:43 UTC (rev 4827) +++ branches/vexi3/org.vexi-library.js/src/main/java/org/ibex/js/Thread.java 2015-11-13 04:06:45 UTC (rev 4828) @@ -91,7 +91,7 @@ public String description() { if (f!=null) { - JS thread_name = f.object.getSafe(JSU.S("name")); + JS thread_name = f.getSafe(JSU.S("name")); String r = type+", "+f.definedAt(); if(thread_name!=null){ r += " - "+thread_name; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn