From bcff9c0d9a1177c2432426ca1ba1207c11db8196 Mon Sep 17 00:00:00 2001 From: Naoyuki Kanezawa Date: Mon, 22 Apr 2013 22:44:01 +0900 Subject: [PATCH] EngineIOException --- .../com/github/nkzawa/emitter/Emitter.java | 1 + .../engineio/client/EngineIOException.java | 20 +++++++++++++++++ .../github/nkzawa/engineio/client/Socket.java | 14 ++++++------ .../nkzawa/engineio/client/Transport.java | 22 ++----------------- .../client/transports/PollingXHR.java | 1 - 5 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java diff --git a/src/main/java/com/github/nkzawa/emitter/Emitter.java b/src/main/java/com/github/nkzawa/emitter/Emitter.java index a59745c..e61681a 100644 --- a/src/main/java/com/github/nkzawa/emitter/Emitter.java +++ b/src/main/java/com/github/nkzawa/emitter/Emitter.java @@ -88,6 +88,7 @@ public class Emitter { } public static interface Listener { + public void call(Object... args); } } diff --git a/src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java b/src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java new file mode 100644 index 0000000..9e0b987 --- /dev/null +++ b/src/main/java/com/github/nkzawa/engineio/client/EngineIOException.java @@ -0,0 +1,20 @@ +package com.github.nkzawa.engineio.client; + +public class EngineIOException extends Exception { + + public EngineIOException() { + super(); + } + + public EngineIOException(String message) { + super(message); + } + + public EngineIOException(String message, Throwable cause) { + super(message, cause); + } + + public EngineIOException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/github/nkzawa/engineio/client/Socket.java b/src/main/java/com/github/nkzawa/engineio/client/Socket.java index 3178699..f678087 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/Socket.java +++ b/src/main/java/com/github/nkzawa/engineio/client/Socket.java @@ -188,8 +188,8 @@ public abstract class Socket extends Emitter { // TODO: handle error Exception err = args.length > 0 ? (Exception)args[0] : null; - Transport.TransportException error = new Transport.TransportException("probe error", err); - error.transport = transport[0].name; + EngineIOException error = new EngineIOException("probe error", err); + //error.transport = transport[0].name; transport[0].close(); transport[0] = null; @@ -239,8 +239,8 @@ public abstract class Socket extends Emitter { }); } else { logger.info(String.format("probe transport '%s' failed", name)); - Transport.TransportException err = new Transport.TransportException("probe error"); - err.transport = transport[0].name; + EngineIOException err = new EngineIOException("probe error"); + //err.transport = transport[0].name; self.emit("error", err); } } @@ -305,8 +305,8 @@ public abstract class Socket extends Emitter { this.ping(); } else if ("error".equals(packet.type)) { // TODO: handle error - Exception err = new Exception("server error"); - // err.code = packet.data; + EngineIOException err = new EngineIOException("server error"); + //err.code = packet.data; this.emit("error", err); } else if ("message".equals(packet.type)) { this.emit("data", packet.data); @@ -491,7 +491,7 @@ public abstract class Socket extends Emitter { this.onclose(); // TODO: // clean buffer in next tick, so developers can still - // gra the buffers on `close` event + // grab the buffers on `close` event // setTimeout(function() {} // self.writeBuffer = []; // self.callbackBuffer = []; diff --git a/src/main/java/com/github/nkzawa/engineio/client/Transport.java b/src/main/java/com/github/nkzawa/engineio/client/Transport.java index 85961b3..4ef7d7c 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/Transport.java +++ b/src/main/java/com/github/nkzawa/engineio/client/Transport.java @@ -22,9 +22,6 @@ public abstract class Transport extends Emitter { protected String timestampParam; protected String readyState = ""; - public Transport() { - // TODO: remove - } public Transport(Options opts) { this.path = opts.path; @@ -37,10 +34,8 @@ public abstract class Transport extends Emitter { } protected Transport onError(String msg, Exception desc) { - // TODO: - Exception err = new Exception(msg); - // err.type = "TransportError"; - // err.description = desc; + // TODO: handle error + Exception err = new EngineIOException(msg, desc); this.emit("error", err); return this; } @@ -107,17 +102,4 @@ public abstract class Transport extends Emitter { public List query; } - - public static class TransportException extends Exception { - - public String transport; - - public TransportException(String detailMessage) { - super(detailMessage); - } - - public TransportException(String detailMessage, Throwable throwable) { - super(detailMessage, throwable); - } - } } diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java index 6e00c23..ef4b27e 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java @@ -123,7 +123,6 @@ public class PollingXHR extends Polling { } this.onData(data.toString()); } catch (IOException e) { - e.printStackTrace(); this.onError(e); } finally { try {