properly rollback #1622

Atmosphere · Jun 6, 2014 · fd21dcb · fd21dcb
1 parent f30ed2c
commit fd21dcb
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/config/managed/ManagedAtmosphereHandler.java b/modules/cpr/src/main/java/org/atmosphere/config/managed/ManagedAtmosphereHandler.java
@@ -31,6 +31,7 @@
 import org.atmosphere.cpr.AtmosphereRequest;
 import org.atmosphere.cpr.AtmosphereResource;
 import org.atmosphere.cpr.AtmosphereResourceEvent;
+import org.atmosphere.cpr.AtmosphereResourceHeartbeatEventListener;
 import org.atmosphere.cpr.AtmosphereResourceImpl;
 import org.atmosphere.cpr.Broadcaster;
 import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
@@ -45,7 +46,6 @@
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -65,7 +65,8 @@
  *
  * @author Jeanfrancois
  */
-public class ManagedAtmosphereHandler extends AbstractReflectorAtmosphereHandler implements AnnotatedProxy {
+public class ManagedAtmosphereHandler extends AbstractReflectorAtmosphereHandler
+        implements AnnotatedProxy, AtmosphereResourceHeartbeatEventListener {
 
     private Logger logger = LoggerFactory.getLogger(ManagedAtmosphereHandler.class);
     private final static List<Decoder<?, ?>> EMPTY = Collections.<Decoder<?, ?>>emptyList();
@@ -321,17 +322,7 @@ private void populateDecoders() {
     }
 
     private Object invoke(Method m, Object o) {
-        if (m != null) {
-            try {
-                return m.invoke(proxiedInstance, o == null ? new Object[]{} : new Object[]{o});
-            } catch (IllegalAccessException e) {
-                logger.debug("", e);
-            } catch (InvocationTargetException e) {
-                logger.debug("", e);
-            }
-        }
-        logger.trace("No Method Mapped for {}", o);
-        return null;
+        return Utils.invoke(proxiedInstance, m, o);
     }
 
     private Object message(AtmosphereResource resource, Object o) {
@@ -427,6 +418,7 @@ protected void processReady(AtmosphereResource r) {
      *
      * @param event the event
      */
+    @Override
     public void onHeartbeat(final AtmosphereResourceEvent event) {
         if (onHeartbeatMethod != null && !Utils.pollableTransport(event.getResource().transport())) {
             invoke(onHeartbeatMethod, event);