DUBBO-503 heartbeat兼容dubbo 1.0

dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Request.java

@@ -100,7 +100,6 @@ public class Request {
         return mEvent && HEARTBEAT_EVENT == mData;
     }
 
-    @Deprecated
     public void setHeartbeat(boolean isHeartbeat) {
         if (isHeartbeat) {
             setEvent(HEARTBEAT_EVENT);

dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java

@@ -31,6 +31,7 @@ import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
 import com.alibaba.dubbo.remoting.Channel;
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.Codec;
+import com.alibaba.dubbo.remoting.exchange.Request;
 import com.alibaba.dubbo.remoting.exchange.Response;
 
 /**
@@ -73,10 +74,13 @@ public class GrizzlyCodecAdapter extends BaseFilter {
         try {
             UnsafeByteArrayOutputStream output = new UnsafeByteArrayOutputStream(1024); // 不需要关闭
             
-            if(!(context.getMessage() instanceof Response)){
-                downstreamCodec.encode(channel, output, context.getMessage());
+            Object msg = context.getMessage();
+            if(! (msg instanceof Response)
+            		&& ! (msg instanceof Request 
+            				&& ((Request)msg).isHeartbeat())) {
+                downstreamCodec.encode(channel, output, msg);
             }else{
-                upstreamCodec.encode(channel, output, context.getMessage());
+                upstreamCodec.encode(channel, output, msg);
             }
             
             GrizzlyChannel.removeChannelIfDisconnectd(connection);

dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaCodecAdapter.java

@@ -15,25 +15,26 @@
  */
 package com.alibaba.dubbo.remoting.transport.mina;
 
-import java.io.IOException;
-
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.io.Bytes;
-import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream;
-import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
-import com.alibaba.dubbo.remoting.Channel;
-import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Codec;
-import com.alibaba.dubbo.remoting.exchange.Response;
+import java.io.IOException;
+
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+import com.alibaba.dubbo.common.Constants;
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.io.Bytes;
+import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream;
+import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
+import com.alibaba.dubbo.remoting.Channel;
+import com.alibaba.dubbo.remoting.ChannelHandler;
+import com.alibaba.dubbo.remoting.Codec;
+import com.alibaba.dubbo.remoting.exchange.Request;
+import com.alibaba.dubbo.remoting.exchange.Response;
 
 /**
  * MinaCodecAdapter.
@@ -90,12 +91,13 @@ final class MinaCodecAdapter implements ProtocolCodecFactory {
             UnsafeByteArrayOutputStream os = new UnsafeByteArrayOutputStream(1024); // 不需要关闭
             MinaChannel channel = MinaChannel.getOrAddChannel(session, url, handler);
             try {
-                if(!(msg instanceof Response)){
+            	if(! (msg instanceof Response)
+                		&& ! (msg instanceof Request 
+                				&& ((Request)msg).isHeartbeat())) {
                     downstreamCodec.encode(channel, os, msg);
-                }else{
+                } else {
                     upstreamCodec.encode(channel, os, msg);
                 }
-                
             } finally {
                 MinaChannel.removeChannelIfDisconnectd(session);
             }

dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyCodecAdapter.java

@@ -15,27 +15,28 @@
  */
 package com.alibaba.dubbo.remoting.transport.netty;
 
-import java.io.IOException;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.common.io.Bytes;
-import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream;
-import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
-import com.alibaba.dubbo.remoting.Codec;
-import com.alibaba.dubbo.remoting.exchange.Response;
+import java.io.IOException;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelHandler.Sharable;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+
+import com.alibaba.dubbo.common.Constants;
+import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.io.Bytes;
+import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream;
+import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
+import com.alibaba.dubbo.remoting.Codec;
+import com.alibaba.dubbo.remoting.exchange.Request;
+import com.alibaba.dubbo.remoting.exchange.Response;
 
 /**
  * NettyCodecAdapter.
@@ -88,12 +89,13 @@ final class NettyCodecAdapter {
             UnsafeByteArrayOutputStream os = new UnsafeByteArrayOutputStream(1024); // 不需要关闭
             NettyChannel channel = NettyChannel.getOrAddChannel(ch, url, handler);
             try {
-                if(!(msg instanceof Response)){
+            	if(! (msg instanceof Response)
+                		&& ! (msg instanceof Request 
+                				&& ((Request)msg).isHeartbeat())) {
                     downstreamCodec.encode(channel, os, msg);
-                }else {
+                } else {
                     upstreamCodec.encode(channel, os, msg);
                 }
-                
             } finally {
                 NettyChannel.removeChannelIfDisconnected(ch);
             }