Browse Source

Exception handling fixed

master
Nikita 11 years ago
parent
commit
c6e917ba2c
  1. 1
      src/main/java/com/corundumstudio/socketio/Configuration.java
  2. 3
      src/main/java/com/corundumstudio/socketio/annotation/OnConnectScanner.java
  3. 3
      src/main/java/com/corundumstudio/socketio/annotation/OnDisconnectScanner.java
  4. 5
      src/main/java/com/corundumstudio/socketio/annotation/OnEventScanner.java
  5. 3
      src/main/java/com/corundumstudio/socketio/annotation/OnJsonObjectScanner.java
  6. 3
      src/main/java/com/corundumstudio/socketio/annotation/OnMessageScanner.java

1
src/main/java/com/corundumstudio/socketio/Configuration.java

@ -100,6 +100,7 @@ public class Configuration {
setPreferDirectBuffer(conf.isPreferDirectBuffer());
setStoreFactory(conf.getStoreFactory());
setAuthorizationListener(conf.getAuthorizationListener());
setExceptionListener(conf.getExceptionListener());
}
private String join(Transport[] transports) {

3
src/main/java/com/corundumstudio/socketio/annotation/OnConnectScanner.java

@ -16,6 +16,7 @@
package com.corundumstudio.socketio.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import com.corundumstudio.socketio.SocketIOClient;
@ -35,6 +36,8 @@ public class OnConnectScanner implements AnnotationScanner {
public void onConnect(SocketIOClient client) {
try {
method.invoke(object, client);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}

3
src/main/java/com/corundumstudio/socketio/annotation/OnDisconnectScanner.java

@ -16,6 +16,7 @@
package com.corundumstudio.socketio.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import com.corundumstudio.socketio.SocketIOClient;
@ -37,6 +38,8 @@ public class OnDisconnectScanner implements AnnotationScanner {
public void onDisconnect(SocketIOClient client) {
try {
method.invoke(object, client);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}

5
src/main/java/com/corundumstudio/socketio/annotation/OnEventScanner.java

@ -16,6 +16,7 @@
package com.corundumstudio.socketio.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@ -70,6 +71,8 @@ public class OnEventScanner implements AnnotationScanner {
i++;
}
method.invoke(object, args);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}
@ -97,6 +100,8 @@ public class OnEventScanner implements AnnotationScanner {
args[dataIndex] = data;
}
method.invoke(object, args);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}

3
src/main/java/com/corundumstudio/socketio/annotation/OnJsonObjectScanner.java

@ -16,6 +16,7 @@
package com.corundumstudio.socketio.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import com.corundumstudio.socketio.AckRequest;
@ -53,6 +54,8 @@ public class OnJsonObjectScanner implements AnnotationScanner {
args[dataIndex] = data;
}
method.invoke(object, args);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}

3
src/main/java/com/corundumstudio/socketio/annotation/OnMessageScanner.java

@ -16,6 +16,7 @@
package com.corundumstudio.socketio.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import com.corundumstudio.socketio.AckRequest;
@ -51,6 +52,8 @@ public class OnMessageScanner implements AnnotationScanner {
args[dataIndex] = data;
}
method.invoke(object, args);
} catch (InvocationTargetException e) {
throw new SocketIOException(e.getCause());
} catch (Exception e) {
throw new SocketIOException(e);
}

Loading…
Cancel
Save