1.1 --- a/json-tck/src/main/java/net/java/html/json/tests/JSONTest.java Tue Aug 27 07:32:12 2013 +0000
1.2 +++ b/json-tck/src/main/java/net/java/html/json/tests/JSONTest.java Sat Aug 31 00:38:59 2013 +0000
1.3 @@ -364,7 +364,7 @@
1.4 js.applyBindings();
1.5 js.setFetched(null);
1.6
1.7 - js.fetchArray("file:///unknown/url/to/query/xyz.txt");
1.8 + js.fetchArray("http://127.0.0.1:54253/does/not/exist.txt");
1.9 }
1.10
1.11
2.1 --- a/json-tck/src/main/java/net/java/html/json/tests/WebSocketTest.java Tue Aug 27 07:32:12 2013 +0000
2.2 +++ b/json-tck/src/main/java/net/java/html/json/tests/WebSocketTest.java Sat Aug 31 00:38:59 2013 +0000
2.3 @@ -54,7 +54,7 @@
2.4 @KOTest public void connectUsingWebSocket() throws Throwable {
2.5 if (js == null) {
2.6 url = Utils.prepareURL(
2.7 - JSONTest.class, "{'firstName': 'Mitar', 'sex': $0}",
2.8 + JSONTest.class, "{'firstName': 'Mitar', 'sex': '$0' }",
2.9 "application/javascript",
2.10 "protocol:ws"
2.11 );
3.1 --- a/json/src/main/java/org/apidesign/html/json/spi/FunctionBinding.java Tue Aug 27 07:32:12 2013 +0000
3.2 +++ b/json/src/main/java/org/apidesign/html/json/spi/FunctionBinding.java Sat Aug 31 00:38:59 2013 +0000
3.3 @@ -47,6 +47,10 @@
3.4 * @param ev event (with additional properties) that triggered the event
3.5 */
3.6 public void call(Object data, Object ev) {
3.7 - fb.call(data, ev);
3.8 + try {
3.9 + fb.call(data, ev);
3.10 + } catch (Throwable ex) {
3.11 + ex.printStackTrace();
3.12 + }
3.13 }
3.14 }
4.1 --- a/ko-ws-tyrus/src/main/java/org/apidesign/html/wstyrus/TyrusContext.java Tue Aug 27 07:32:12 2013 +0000
4.2 +++ b/ko-ws-tyrus/src/main/java/org/apidesign/html/wstyrus/TyrusContext.java Sat Aug 31 00:38:59 2013 +0000
4.3 @@ -85,7 +85,10 @@
4.4 @Override
4.5 public void close(Comm socket) {
4.6 try {
4.7 - socket.session.close();
4.8 + final Session s = socket.session;
4.9 + if (s != null) {
4.10 + s.close();
4.11 + }
4.12 } catch (IOException ex) {
4.13 socket.callback.notifyError(ex);
4.14 }